Switch setup-java cache (#2481)

* Switch from actions/cache to the new built-in cache in actions/setup-java * Fix some workflows using mvnw without explicitly installing Java Signed-off-by: Steven Sheehy <steven.sheehy@hedera.com>
hashgraph · Aug 31, 2021 · e975816 · e975816
1 parent 3b355cc
commit e975816
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 60 deletions.
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -81,12 +81,12 @@ jobs:
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Cache Maven Packages
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Create and Switch to Release Branch
         run: |
@@ -172,12 +172,12 @@ jobs:
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Cache Maven Packages
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Reset main to release branch
         run: |

diff --git a/.github/workflows/grpc-api.yml b/.github/workflows/grpc-api.yml
@@ -29,16 +29,10 @@ jobs:
       - name: Install JDK
         uses: actions/setup-java@v2
         with:
+          cache: 'maven'
           distribution: 'adopt'
           java-version: 11
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('./pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
-
       - name: Maven verify
         run: ./mvnw ${MAVEN_CLI_OPTS} verify -pl "${MODULE}" --also-make -Dspring.profiles.active=${{ matrix.schema }}
         working-directory: .

diff --git a/.github/workflows/importer.yml b/.github/workflows/importer.yml
@@ -29,16 +29,10 @@ jobs:
       - name: Install JDK
         uses: actions/setup-java@v2
         with:
+          cache: 'maven'
           distribution: 'adopt'
           java-version: 11
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('./pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
-
       - name: Maven verify
         run: ./mvnw ${MAVEN_CLI_OPTS} verify -pl "${MODULE}" --also-make -Dspring.profiles.active=${{ matrix.schema }}
         working-directory: .

diff --git a/.github/workflows/monitor.yml b/.github/workflows/monitor.yml
@@ -26,16 +26,10 @@ jobs:
       - name: Install JDK
         uses: actions/setup-java@v2
         with:
+          cache: 'maven'
           distribution: 'adopt'
           java-version: 11
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('./pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
-
       - name: Maven verify
         run: ./mvnw ${MAVEN_CLI_OPTS} verify -pl "${MODULE}" --also-make -Dtest='!com.hedera.mirror.importer.**' -DfailIfNoTests=false
         working-directory: .

diff --git a/.github/workflows/release-integration.yml b/.github/workflows/release-integration.yml
@@ -12,12 +12,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Cache Maven packages
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Login to Google Container Registry
         uses: google-github-actions/setup-gcloud@master

diff --git a/.github/workflows/release-production.yml b/.github/workflows/release-production.yml
@@ -13,12 +13,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Cache Maven packages
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Login to Google Container Registry
         uses: google-github-actions/setup-gcloud@master

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -18,12 +18,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Cache Maven dependencies
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Vulnerability check
         run: ./mvnw ${MAVEN_CLI_OPTS} dependency-check:aggregate
@@ -38,12 +38,12 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Cache Maven dependencies
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Cache SonarCloud dependencies
         uses: actions/cache@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,17 +12,13 @@ jobs:
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '11'
 
-      - name: Cache Maven packages
-        uses: actions/cache@v2
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Maven package
         run: ./mvnw.cmd package --batch-mode --no-transfer-progress -DskipTests