shut up github action warnings

dcarbone · Dec 22, 2024 · b391ffd · b391ffd
1 parent c255e74
commit b391ffd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/.github/actions/load-fhir-validator/action.yaml b/.github/actions/load-fhir-validator/action.yaml
@@ -27,14 +27,14 @@ runs:
         echo 'url=${{ inputs.base-url }}/${{ inputs.version }}/${{ inputs.filename }}' >> $GITHUB_OUTPUT
         echo 'cache-key=fhir-validator-${{ inputs.version }}-2' >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v4
-      id: cache
+    - name: 'Init validator cache'
+      uses: actions/cache@v4
+      id: validator-cache
       with:
         path: |
           ${{ github.workspace }}/bin
           /home/runner/.fhir
         key: '${{ steps.vars.outputs.cache-key }}'
-        save-always: true
 
     - name: 'Install Java'
       if: steps.cache.outputs.cache-hit != 'true' && steps.cache.outputs.cache-hit != true
@@ -63,3 +63,11 @@ runs:
         java -jar '${{ github.workspace }}/bin/validator_cli.jar' -version 5.0.0
         echo '::endgroup::'
         
+    - name: 'Save validator cache'
+      if: steps.validator-cache.outputs.cache-hit != 'true' && steps.validator-cache.outputs.cache-hit != true
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ${{ github.workspace }}/bin
+          /home/runner/.fhir
+        key: '${{ steps.vars.outputs.cache-key }}'
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   load-fhir-source:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:
@@ -119,19 +119,26 @@ jobs:
         run: |
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-      - name: 'Cache Composer Stuff'
+      - name: 'Init composer dep cache'
+        id: cache
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
-          save-always: true
 
       - name: 'Install Composer deps'
         # language=sh
         run: |
           rm composer.lock
           composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
+      - name: 'Save composer dep cache'
+        if: steps.composer-cache.outputs.cache-hit != 'true' && steps.composer-cache.outputs.cache-hit != true
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
+
       - name: 'Generate code'
         # language=sh
         run: |