Merge pull request #11517 from keymanapp/fix/linux/apiverification

fix(linux): Pass artifacts key to API verification GHA
keymanapp · May 24, 2024 · 556b0ce · 556b0ce
2 parents fad47b1 + f95ee27
commit 556b0ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/api-verification.yml b/.github/workflows/api-verification.yml
@@ -22,21 +22,22 @@ jobs:
       GIT_BRANCH: ${{ steps.environment_step.outputs.GIT_BRANCH }}
       GIT_BASE_BRANCH: ${{ steps.environment_step.outputs.GIT_BASE_BRANCH }}
       GIT_USER: ${{ steps.environment_step.outputs.GIT_USER }}
+      ARTIFACTS_KEY: ${{ steps.environment_step.outputs.ARTIFACTS_KEY }}
 
     steps:
+    - name: Read environment
+      id: environment_step
+      run: |
+        cat artifacts/env >> $GITHUB_OUTPUT
+
     - name: Restore artifacts
-      uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: |
           artifacts
-        key: artifacts-key-${GITHUB_RUN_ID}
+        key: ${ARTIFACTS_KEY}
         restore-keys: artifacts-key-
 
-    - name: Read environment
-      id: environment_step
-      run: |
-        cat artifacts/env >> $GITHUB_OUTPUT
-
   api_verification:
     name: Verify API for libkeymancore.so
     needs: setup_environment

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
@@ -313,13 +313,14 @@ jobs:
         echo "GIT_BRANCH=${{ github.event.client_payload.branch }}" >> artifacts/env
         echo "GIT_BASE_BRANCH=${{ github.event.client_payload.baseBranch }}" >> artifacts/env
         echo "GIT_USER=${{ github.event.client_payload.user }}" >> artifacts/env
+        echo "ARTIFACTS_KEY=artifacts-key-${GITHUB_RUN_ID}" >> artifacts/env
 
     - name: Cache artifacts
-      uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: |
           artifacts
-        key: artifacts-key-${GITHUB_RUN_ID}
+        key: ${ARTIFACTS_KEY}
 
   # We intentionally ignore the results of binary_packages_unreleased
   set_status: