Skip to content

Commit bd97b8b

Browse files
committed
Add correct cahce checkout
1 parent 8388c7a commit bd97b8b

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

.github/workflows/build-wolfprovider.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-22.04
2626
timeout-minutes: 20
2727
outputs:
28-
cache_key: wolfprov${{ inputs.replace_default && '-replace-default' || '' }}-${{ steps.wolfssl-ref.outputs.ref }}-${{ steps.openssl-ref.outputs.ref }}-${{ github.sha }}
28+
cache_key: wolfprov${{ inputs.replace_default && '-replace-default' || '' }}-${{ inputs.wolfssl_ref }}-${{ inputs.openssl_ref }}-${{ github.sha }}
2929
steps:
3030
- name: Checkout wolfProvider
3131
uses: actions/checkout@v4
@@ -93,7 +93,7 @@ jobs:
9393
openssl-install/include
9494
openssl-install/bin
9595
${{ inputs.replace_default && 'libdefault-stub-install' || '' }}
96-
key: wolfprov${{ inputs.replace_default && '-replace-default' || '' }}-${{ steps.wolfssl-ref.outputs.ref }}-${{ steps.openssl-ref.outputs.ref }}-${{ github.sha }}
96+
key: wolfprov${{ inputs.replace_default && '-replace-default' || '' }}-${{ inputs.wolfssl_ref }}-${{ inputs.openssl_ref }}-${{ github.sha }}
9797

9898
# If openssl cache miss, save it to the cache
9999
- name: Save OpenSSL into cache

.github/workflows/cjose.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,6 @@ jobs:
5858
with:
5959
fetch-depth: 1
6060

61-
- name: Get OpenSSL commit hash
62-
id: openssl-ref
63-
run: |
64-
sha=$(./scripts/resolve-ref.sh "${{ matrix.openssl_ref }}" "openssl/openssl")
65-
echo "ref=$sha" >> "$GITHUB_OUTPUT"
66-
env:
67-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68-
69-
- name: Get WolfSSL commit hash
70-
id: wolfssl-ref
71-
run: |
72-
sha=$(./scripts/resolve-ref.sh "${{ matrix.wolfssl_ref }}" "wolfssl/wolfssl")
73-
echo "ref=$sha" >> "$GITHUB_OUTPUT"
74-
env:
75-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76-
7761
- name: Retrieving wolfProvider from cache
7862
uses: actions/cache/restore@v4
7963
id: wolfprov-cache-restore
@@ -86,9 +70,9 @@ jobs:
8670
openssl-install/bin
8771
${{ matrix.replace_default && 'libdefault-stub-install' || '' }}
8872
89-
key: wolfprov${{ matrix.replace_default && '-replace-default' || '' }}-${{ steps.wolfssl-ref.outputs.ref }}-${{ steps.openssl-ref.outputs.ref }}-${{ github.sha }}
73+
key: wolfprov${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
9074
restore-keys: |
91-
wolfprov${{ matrix.replace_default && '-replace-default' || '' }}-${{ steps.wolfssl-ref.outputs.ref }}-${{ steps.openssl-ref.outputs.ref }}-
75+
wolfprov${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-
9276
fail-on-cache-miss: true
9377

9478
- name: Install cjose dependencies

0 commit comments

Comments
 (0)