This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new fa0a7550bc Update GitHub Actions Maven cache mechanism
fa0a7550bc is described below

commit fa0a7550bc651c1a4673daf083fd70ffda9b7716
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Mon Nov 25 14:47:08 2024 -0500

    Update GitHub Actions Maven cache mechanism
    
    * Use actions/setup-java's maven cache, rather than using
      actions/cache directly
---
 .github/workflows/maven-full-its.yaml  | 18 ++----------------
 .github/workflows/maven-on-demand.yaml |  9 +--------
 .github/workflows/maven.yaml           | 18 ++----------------
 3 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/maven-full-its.yaml 
b/.github/workflows/maven-full-its.yaml
index 8a19764736..4d7145d368 100644
--- a/.github/workflows/maven-full-its.yaml
+++ b/.github/workflows/maven-full-its.yaml
@@ -53,14 +53,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Build with Maven (Fast Build)
@@ -97,14 +90,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Override DNS to fix IP address for hostname
       run: |
         ip -br addr
diff --git a/.github/workflows/maven-on-demand.yaml 
b/.github/workflows/maven-on-demand.yaml
index f84a53b027..244cacc88c 100644
--- a/.github/workflows/maven-on-demand.yaml
+++ b/.github/workflows/maven-on-demand.yaml
@@ -70,14 +70,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Override DNS to fix IP address for hostname
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index e680428c4d..ad7c810418 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -43,14 +43,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Check for unapproved characters
@@ -81,14 +74,7 @@ jobs:
       with:
         distribution: adopt
         java-version: ${{ matrix.profile.javaver }}
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Override DNS to fix IP address for hostname
       run: |
         ip -br addr

Reply via email to