Update caching

qld-gov-au · Jun 7, 2024 · 1d1197e · 1d1197e
1 parent 156f6c0
commit 1d1197e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 34 deletions.
diff --git a/.github/workflows/githubPackage.yml b/.github/workflows/githubPackage.yml
@@ -28,23 +28,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache Maven packages
-        id: cache-nvm
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: Set up JDK ${{ matrix.jdk }}
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '${{ matrix.jdk }}'
 
+      - name: Cache Maven packages
+        id: cache-maven
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          save-always: true
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}
+
       - name: Get Versions
         run: |
           echo "Google chrome version"
@@ -79,23 +78,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache Maven packages
-        id: cache-nvm
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '21'
 
+      - name: Cache Maven packages
+        id: cache-maven
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          save-always: true
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}
+
       - name: Get Versions
         run: |
           echo "Google chrome version"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,27 +5,27 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache Maven packages
-        id: cache-nvm
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          save-always: true
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '21'
 
+      - name: Cache Maven packages
+        id: cache-maven
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          save-always: true
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}
+
       - name: Get Versions
         run: |
           echo "Google chrome version"