GitHub actions - Separate cache keys

locationtech · Sep 20, 2024 · 60a6a49 · 60a6a49
1 parent c2a9d4f
commit 60a6a49
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -24,7 +24,12 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          cache: 'maven'
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-compile-${{ inputs.scala.version }}
+          path: |
+            ~/.m2/repository/
+            build/zinc-0.3.15/
       - name: Set Scala version
         run: ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
       - name: Build with Maven

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -24,7 +24,10 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          cache: 'maven'
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-docs
+          path: ~/.m2/repository/
       - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
         with:
           python-version: '3.10'

diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml
@@ -24,7 +24,12 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          cache: 'maven'
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-dash
+          path: |
+            ~/.m2/repository/
+            build/zinc-0.3.15/
       - name: Build with Maven
         run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
       - name: License check

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -20,11 +20,12 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          cache: 'maven'
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-it-${{ inputs.scala.version }}
+          path: ~/.m2/repository/
       - name: Set Scala version
-        run: |
-          echo ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
-          ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
+        run: ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
       - name: Download artifacts
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:

diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
@@ -25,6 +25,9 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          cache: 'maven'
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-compile-${{ inputs.scala.version }}
+          path: ~/.m2/repository/
       - name: Run license check
         run: mvn license:check $MAVEN_CLI_OPTS
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -23,11 +23,16 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          cache: 'maven'
+      - name: Generate cache key
+        env:
+          MOD_SELECTOR: "${{ inputs.module-selector }}"
+        run: echo "MOD_SELECTOR=\"${MOD_SELECTOR// /}\"" >> $GITHUB_ENV
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-unit-tests-${{ inputs.scala.version }}-${{ env.MOD_SELECTOR }}
+          path: ~/.m2/repository/
       - name: Set Scala version
-        run: |
-          echo ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
-          ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
+        run: ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
       - name: Download artifacts
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
@@ -42,7 +47,6 @@ jobs:
         continue-on-error: true
         run: |
           set -o pipefail
-          echo mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS ${{ inputs.module-selector }}
           mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS ${{ inputs.module-selector }} | tee -a test.log
       - name: Unit tests (retry)
         id: test-retry