Skip to content

Commit 82fc3c1

Browse files
committed
Add mock test for default replace
1 parent 013f4e6 commit 82fc3c1

3 files changed

Lines changed: 23 additions & 7 deletions

File tree

.github/workflows/bind9.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ jobs:
1818
with:
1919
wolfssl_ref: ${{ matrix.wolfssl_ref }}
2020
openssl_ref: ${{ matrix.openssl_ref }}
21+
replace_default: ${{ matrix.replace_default || false }}
2122
strategy:
2223
matrix:
2324
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
2425
openssl_ref: [ 'openssl-3.5.0' ]
26+
replace_default: [ false, true ]
2527

2628
test_bind:
2729
runs-on: ubuntu-22.04
@@ -38,6 +40,7 @@ jobs:
3840
bind_ref: [ 'v9.18.28' ]
3941
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
4042
openssl_ref: [ 'openssl-3.5.0' ]
43+
replace_default: [ false, true ]
4144
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4245
steps:
4346
- name: Install sudo
@@ -60,8 +63,9 @@ jobs:
6063
openssl-install/lib64
6164
openssl-install/include
6265
openssl-install/bin
66+
${{ matrix.replace_default && 'libdefault-stub-install' || '' }}
6367
64-
key: wolfprov-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
68+
key: wolfprov${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
6569
fail-on-cache-miss: true
6670

6771
- name: Install bind9 test dependencies

.github/workflows/build-wolfprovider.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ on:
99
openssl_ref:
1010
required: true
1111
type: string
12+
replace_default:
13+
required: false
14+
type: boolean
15+
default: false
16+
description: "Build with --replace-default flag"
1217
outputs:
1318
cache_key:
1419
description: "Cache key for the build artifacts"
@@ -24,7 +29,7 @@ jobs:
2429
DEBIAN_FRONTEND: noninteractive
2530
timeout-minutes: 20
2631
outputs:
27-
cache_key: wolfprov-${{ inputs.wolfssl_ref }}-${{ inputs.openssl_ref }}-${{ github.sha }}
32+
cache_key: wolfprov${{ inputs.replace_default && '-replace-default' || '' }}-${{ inputs.wolfssl_ref }}-${{ inputs.openssl_ref }}-${{ github.sha }}
2833
steps:
2934
- name: Install dependencies
3035
run: |
@@ -62,7 +67,8 @@ jobs:
6267
with:
6368
path: |
6469
openssl-install
65-
key: ossl-depends-${{ steps.openssl-ref.outputs.ref }}
70+
${{ inputs.replace_default && 'libdefault-stub-install' || '' }}
71+
key: ossl${{ inputs.replace_default && '-replace-default' || '' }}-depends-${{ steps.openssl-ref.outputs.ref }}
6672
lookup-only: false
6773

6874
# Look for a cached version of WolfSSL
@@ -77,7 +83,7 @@ jobs:
7783

7884
- name: Build wolfProvider
7985
run: |
80-
OPENSSL_TAG=${{ inputs.openssl_ref }} WOLFSSL_TAG=${{ inputs.wolfssl_ref }} ./scripts/build-wolfprovider.sh
86+
OPENSSL_TAG=${{ inputs.openssl_ref }} WOLFSSL_TAG=${{ inputs.wolfssl_ref }} ./scripts/build-wolfprovider.sh ${{ inputs.replace_default && '--replace-default' || '' }}
8187
8288
# Save the wolfProvider outputs for use by the parent jobs.
8389
# Note that we don't try to restore since it will likely always
@@ -91,7 +97,8 @@ jobs:
9197
openssl-install/lib64
9298
openssl-install/include
9399
openssl-install/bin
94-
key: wolfprov-${{ inputs.wolfssl_ref }}-${{ inputs.openssl_ref }}-${{ github.sha }}
100+
${{ inputs.replace_default && 'libdefault-stub-install' || '' }}
101+
key: wolfprov${{ inputs.replace_default && '-replace-default' || '' }}-${{ inputs.wolfssl_ref }}-${{ inputs.openssl_ref }}-${{ github.sha }}
95102

96103
# If openssl cache miss, save it to the cache
97104
- name: Save OpenSSL into cache
@@ -100,7 +107,8 @@ jobs:
100107
with:
101108
path: |
102109
openssl-install
103-
key: ossl-depends-${{ steps.openssl-ref.outputs.ref }}
110+
${{ inputs.replace_default && 'libdefault-stub-install' || '' }}
111+
key: ossl${{ inputs.replace_default && '-replace-default' || '' }}-depends-${{ steps.openssl-ref.outputs.ref }}
104112

105113
- name: Save WolfSSL into cache
106114
if: steps.wolfssl-cache.outputs.cache-hit != 'true'

.github/workflows/cjose.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ jobs:
1818
with:
1919
wolfssl_ref: ${{ matrix.wolfssl_ref }}
2020
openssl_ref: ${{ matrix.openssl_ref }}
21+
replace_default: ${{ matrix.replace_default || false }}
2122
strategy:
2223
matrix:
2324
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
2425
openssl_ref: [ 'openssl-3.5.0' ]
26+
replace_default: [ false, true ]
2527

2628
test_cjose:
2729
runs-on: ubuntu-22.04
@@ -38,6 +40,7 @@ jobs:
3840
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
3941
openssl_ref: [ 'openssl-3.5.0' ]
4042
force_fail: [ 'WOLFPROV_FORCE_FAIL=1', '' ]
43+
replace_default: [ false, true ]
4144
steps:
4245
- name: Install sudo
4346
run: |
@@ -59,8 +62,9 @@ jobs:
5962
openssl-install/lib64
6063
openssl-install/include
6164
openssl-install/bin
65+
${{ matrix.replace_default && 'libdefault-stub-install' || '' }}
6266
63-
key: wolfprov-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
67+
key: wolfprov${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
6468
fail-on-cache-miss: true
6569

6670
- name: Install cjose dependencies

0 commit comments

Comments
 (0)