Skip to content

Commit 4ee093e

Browse files
padelsbachpadelsbach
committed
Update remaining workflows
1 parent 979bbeb commit 4ee093e

37 files changed

+212
-75
lines changed

‎.github/workflows/bind9.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_bind:
2930
runs-on: ubuntu-22.04
@@ -42,6 +43,7 @@ jobs:
4243
openssl_ref: [ 'openssl-3.5.2' ]
4344
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4445
replace_default: [ true ]
46+
fips: [ false ]
4547
env:
4648
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4749
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -81,6 +83,10 @@ jobs:
8183
apt install --reinstall -y \
8284
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8385
86+
- name: Verify wolfProvider is properly installed
87+
run: |
88+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
89+
8490
- name: Install bind9 test dependencies
8591
run: |
8692
apt-get update
@@ -113,8 +119,6 @@ jobs:
113119
working-directory: bind9
114120
shell: bash
115121
run: |
116-
# Verify wolfProvider is properly installed
117-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
118122
119123
set +o pipefail # ignore errors from make check
120124
autoreconf -ivf

‎.github/workflows/cjose.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ jobs:
9090
apt install --reinstall -y \
9191
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
9292
93+
- name: Verify wolfProvider is properly installed
94+
run: |
95+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
96+
9397
- name: Download cjose
9498
uses: actions/checkout@v4
9599
with:
@@ -109,8 +113,6 @@ jobs:
109113
- name: Run cjose tests
110114
working-directory: cjose
111115
run: |
112-
# Verify wolfProvider is properly installed
113-
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '-replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
114116
export ${{ matrix.force_fail }}
115117
116118
make test 2>&1 | tee cjose-test.log

‎.github/workflows/curl.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_curl:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
openssl_ref: [ 'openssl-3.5.2' ]
4243
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install dependencies
8490
run: |
8591
apt-get update
@@ -107,8 +113,6 @@ jobs:
107113
working-directory: curl
108114
shell: bash
109115
run: |
110-
# Verify wolfProvider is properly installed
111-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
112116
set +o pipefail # ignore errors from make check
113117
export ${{ matrix.force_fail }}
114118
export CURL_REF=${{ matrix.curl_ref }}

‎.github/workflows/debian-package.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ jobs:
210210
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
211211
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
212212
213+
- name: Verify wolfProvider is properly installed
214+
run: |
215+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
216+
213217
- name: Show OpenSSL version
214218
run: |
215219
echo "OpenSSL version:"

‎.github/workflows/git-ssh-dr.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ jobs:
1515
uses: ./.github/workflows/build-wolfprovider.yml
1616
with:
1717
wolfssl_ref: ${{ matrix.wolfssl_ref }}
18-
openssl_ref: 'openssl-3.5.0'
18+
openssl_ref: 'openssl-3.5.2'
1919
replace_default: true
2020
strategy:
2121
matrix:
2222
wolfssl_ref: ['master', 'v5.8.2-stable']
23+
fips: [ false ]
2324

2425
git-ssh-default-replace-test:
2526
runs-on: ubuntu-22.04
@@ -36,6 +37,7 @@ jobs:
3637
key_type: [ 'rsa', 'ecdsa', 'ed25519', 'chacha20-poly1305' ]
3738
force_fail: [ 'WOLFPROV_FORCE_FAIL=1', '' ]
3839
iterations: [ 10 ] # Total of 50 runs
40+
fips: [ false ]
3941
env:
4042
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4143
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -76,6 +78,10 @@ jobs:
7678
apt install --reinstall -y \
7779
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7880
81+
- name: Verify wolfProvider is properly installed
82+
run: |
83+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
84+
7985
- name: Set up environment
8086
run: |
8187
export DEBIAN_FRONTEND=noninteractive
@@ -86,9 +92,6 @@ jobs:
8692
- name: Run git + replace default + ssh test
8793
shell: bash
8894
run: |
89-
# Verify wolfProvider is properly installed
90-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
91-
9295
echo "=== Running Git + replace default + ssh Test ==="
9396
echo "Using the local test script for consistent testing"
9497
# Run the test with the matrix parameters

‎.github/workflows/grpc.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_grpc:
2930
runs-on: ubuntu-22.04
@@ -48,6 +49,7 @@ jobs:
4849
wolfssl_ref: [ 'v5.8.2-stable' ]
4950
openssl_ref: [ 'openssl-3.5.2' ]
5051
replace_default: [ true ]
52+
fips: [ false ]
5153
env:
5254
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
5355
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -87,6 +89,10 @@ jobs:
8789
apt install --reinstall -y \
8890
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8991
92+
- name: Verify wolfProvider is properly installed
93+
run: |
94+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
95+
9096
- name: Install prerequisites
9197
run: |
9298
apt-get update
@@ -129,8 +135,6 @@ jobs:
129135
- name: Run grpc tests with wolfProvider
130136
working-directory: ./grpc
131137
run: |
132-
# Verify wolfProvider is properly installed
133-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
134138
135139
# Start the port server
136140
./tools/run_tests/start_port_server.py

‎.github/workflows/iperf.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_iperf:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
openssl_ref: [ 'openssl-3.5.2' ]
4243
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install dependencies
8490
run: |
8591
apt-get update
@@ -118,8 +124,6 @@ jobs:
118124
- name: Run tests
119125
working-directory: iperf
120126
run: |
121-
# Verify wolfProvider is properly installed
122-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
123127
export ${{ matrix.force_fail }}
124128
125129
# Test variables for iperf

‎.github/workflows/ipmitool.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_ipmitool:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
wolfssl_ref: [ 'v5.8.2-stable' ]
4243
openssl_ref: [ 'openssl-3.5.2' ]
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install dependencies
8490
run: |
8591
apt-get update
@@ -97,8 +103,6 @@ jobs:
97103
- name: Confirm built with OpenSSL and test with wolfProvider
98104
working-directory: ipmitool
99105
run: |
100-
# Verify wolfProvider is properly installed
101-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
102106
103107
# Verify ipmitool was built and linked correctly with OpenSSL
104108
ldd src/ipmitool | grep -E '(libssl|libcrypto)'

‎.github/workflows/krb5.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_krb5:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
openssl_ref: [ 'openssl-3.5.2' ]
4243
force_fail: [ 'WOLFPROV_FORCE_FAIL=1', '' ]
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install KRB5 dependencies
8490
run: |
8591
apt-get update
@@ -112,8 +118,6 @@ jobs:
112118
working-directory: krb5
113119
shell: bash
114120
run: |
115-
# Verify wolfProvider is properly installed
116-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
117121
118122
set +o pipefail # ignore errors from make check
119123
# Build KRB5

‎.github/workflows/libcryptsetup.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_cryptsetup:
2930
runs-on: ubuntu-22.04
@@ -42,6 +43,7 @@ jobs:
4243
openssl_ref: ['openssl-3.5.2']
4344
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4445
replace_default: [ true ]
46+
fips: [ false ]
4547
env:
4648
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4749
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -82,6 +84,10 @@ jobs:
8284
apt install --reinstall -y \
8385
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8486
87+
- name: Verify wolfProvider is properly installed
88+
run: |
89+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
90+
8591
- name: Install dependencies
8692
run: |
8793
apt-get update
@@ -131,8 +137,6 @@ jobs:
131137
- name: Run cryptsetup tests
132138
working-directory: cryptsetup
133139
run: |
134-
# Verify wolfProvider is properly installed
135-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
136140
export ${{ matrix.force_fail }}
137141
138142
# from the cryptsetup source root

0 commit comments

Comments
 (0)