Skip to content

Commit 76f15e4

Browse files
authored
Merge pull request #145 from aidangarske/simple-ref-fix
Fix Refs in `simple.yml`
2 parents 988e613 + 8266224 commit 76f15e4

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

.github/workflows/simple.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ jobs:
1919
timeout-minutes: 20
2020
strategy:
2121
matrix:
22-
build_ref:
23-
- ''
24-
- 'OPENSSL_TAG=master'
25-
- 'WOLFSSL_TAG=master'
26-
- 'OPENSSL_TAG=master WOLFSSL_TAG=master'
27-
openssl_ref: [ 'openssl-3.5.0' ]
22+
openssl_ref: [ 'master', 'openssl-3.5.0' ]
23+
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
2824
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
2925

3026
steps:
@@ -43,12 +39,12 @@ jobs:
4339
wolfprov-install
4440
provider.conf
4541
46-
key: wolfprov-${{ matrix.build_ref }}-${{ github.sha }}
42+
key: wolfprov-${{ matrix.wolfssl_ref }}-${{ github.sha }}
4743
lookup-only: true
4844

4945
# If wolfssl/wolfprovider have not yet been built, pull ossl from cache
5046
- name: Checking OpenSSL in cache
51-
if: steps.wolfprov-${{ matrix.build_ref }}-cache.hit != 'true'
47+
if: steps.wolfprov-${{ matrix.wolfssl_ref }}-cache.hit != 'true'
5248
uses: actions/cache@v4
5349
id: openssl-cache
5450
with:
@@ -61,9 +57,9 @@ jobs:
6157

6258
# If not yet built this version, build it now
6359
- name: Build wolfProvider
64-
if: steps.wolfprov-${{ matrix.build_ref }}-cache.hit != 'true'
60+
if: steps.wolfprov-${{ matrix.wolfssl_ref }}-cache.hit != 'true'
6561
run: |
66-
${{ matrix.build_ref.openssl }} ${{ matrix.build_ref.wolfssl }} ./scripts/build-wolfprovider.sh
62+
OPENSSL_TAG=${{ matrix.openssl_ref }} WOLFSSL_TAG=${{ matrix.wolfssl_ref }} ./scripts/build-wolfprovider.sh
6763
6864
- name: Run simple tests
6965
run: |

0 commit comments

Comments
 (0)