Use the same maven cache for all (#11241)

Motivation:

We should use the same maven cache for all builds so we can re-use as much of the downloaded maven dependencies as possible

Modifications:

- Just use the same cache for all

Result:

Hopefully be able to re-use most of the dependencies

.github/workflows/ci-build.yml

@@ -25,15 +25,13 @@ jobs:
       - uses: actions/checkout@v2
 
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: build-${{ matrix.setup }}-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-build-
 
       # Enable caching of Docker layers
       - uses: satackey/action-docker-layer-caching@v0.0.11

.github/workflows/ci-deploy.yml

@@ -28,15 +28,13 @@ jobs:
       - uses: actions/checkout@v2
 
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: staging-${{ matrix.setup }}-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-staging-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-staging-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-staging-
 
       # Enable caching of Docker layers
       - uses: satackey/action-docker-layer-caching@v0.0.11
@@ -77,15 +75,13 @@ jobs:
           java-version: 8
 
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: deploy-staging-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-deploy-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-deploy-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-deploy-
 
       # Setup some env to re-use later.
       - name: Prepare enviroment variables

.github/workflows/ci-pr.yml

@@ -17,15 +17,13 @@ jobs:
         with:
           java-version: 8
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: verify-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-pr-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-pr-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-pr-
       - name: Verify with Maven
         run: mvn verify -B --file pom.xml -Pci -DskipTests=true
 
@@ -38,15 +36,13 @@ jobs:
       - uses: actions/checkout@v2
 
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: build-pr-aarch64-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-pr-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-pr-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-pr-
 
       - uses: uraimo/run-on-arch-action@v2.0.9
         name: Run commands
@@ -99,15 +95,13 @@ jobs:
       - uses: actions/checkout@v2
 
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: build-${{ matrix.setup }}-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-pr-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-pr-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-pr-
 
       # Enable caching of Docker layers
       - uses: satackey/action-docker-layer-caching@v0.0.11

.github/workflows/ci-release.yml

@@ -30,15 +30,13 @@ jobs:
           known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
 
       # Cache .m2/repository
-      - uses: actions/cache@v2
+      - name: Cache local Maven repository
-        env:
+        uses: actions/cache@v2
-          cache-name: release-cache-m2-repository
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-pr-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-pr-${{ env.cache-name }}-
+            ${{ runner.os }}-maven-
-            ${{ runner.os }}-pr-
 
       - name: Prepare release with Maven
         run: |

.github/workflows/codeql-analysis.yml

@@ -37,15 +37,13 @@ jobs:
         fetch-depth: 2
 
     # Cache .m2/repository
-    - uses: actions/cache@v2
+    - name: Cache local Maven repository
-      env:
+      uses: actions/cache@v2
-        cache-name: verify-cache-m2-repository
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-pr-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-pr-${{ env.cache-name }}-
+          ${{ runner.os }}-maven-
-          ${{ runner.os }}-pr-
 
     # If this run was triggered by a pull request event, then checkout
     # the head of the pull request instead of the merge commit.