Skip to content

Commit 5b515cd

Browse files
ColtonWilleyColtonWilley
authored
Merge pull request #168 from padelsbach/wp_setup_env_script
Add setup-env script to set provider environment variables
2 parents 62ccdce + 6a3de14 commit 5b515cd

18 files changed

Lines changed: 106 additions & 116 deletions

‎.github/workflows/build-wolfprovider.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
id: wolfprov-cache
3333
with:
3434
path: |
35+
scripts
3536
wolfssl-source
3637
wolfssl-install
3738
wolfprov-install

‎.github/workflows/cjose.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
id: wolfprov-cache-restore
4646
with:
4747
path: |
48+
scripts
4849
wolfssl-source
4950
wolfssl-install
5051
wolfprov-install
@@ -81,15 +82,8 @@ jobs:
8182
working-directory: cjose
8283
run: |
8384
# Set up the environment for wolfProvider
84-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
85-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
86-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
85+
source $GITHUB_WORKSPACE/scripts/env-setup
8786
export ${{ matrix.force_fail }}
88-
export SHELL=/bin/bash
89-
90-
echo "Checking OpenSSL providers:"
91-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
92-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
9387
9488
# Run tests
9589
make test || true

‎.github/workflows/curl.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
id: wolfprov-cache
4949
with:
5050
path: |
51+
scripts
5152
wolfssl-source
5253
wolfssl-install
5354
wolfprov-install
@@ -82,18 +83,11 @@ jobs:
8283
- name: Test curl with wolfProvider
8384
working-directory: curl
8485
run: |
85-
# Set environment variables
86-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
87-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
88-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
89-
export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/openssl-install/lib64/pkgconfig
86+
# Set up the environment for wolfProvider
87+
source $GITHUB_WORKSPACE/scripts/env-setup
9088
export ${{ matrix.force_fail }}
9189
export CURL_REF=${{ matrix.curl_ref }}
9290
93-
echo "Checking OpenSSL providers:"
94-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
95-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
96-
9791
# Run tests and save output to test.log
9892
mkdir -p tests
9993
make -j$(nproc) test-ci 2>&1 | tee tests/test.log

‎.github/workflows/grpc.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
id: wolfprov-cache
5353
with:
5454
path: |
55+
scripts
5556
wolfssl-source
5657
wolfssl-install
5758
wolfprov-install
@@ -86,14 +87,9 @@ jobs:
8687
- name: Build grpc with wolfProvider
8788
working-directory: ./grpc
8889
run: |
89-
# Setup environment for wolfProviders
90-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
91-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
92-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
93-
94-
echo "Checking OpenSSL providers:"
95-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
96-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
90+
# Set up the environment for wolfProvider
91+
source $GITHUB_WORKSPACE/scripts/env-setup
92+
export ${{ matrix.force_fail }}
9793
9894
# Initialize submodules
9995
git submodule update --init

‎.github/workflows/iperf.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
id: wolfprov-cache
4646
with:
4747
path: |
48+
scripts
4849
wolfssl-source
4950
wolfssl-install
5051
wolfprov-install
@@ -92,11 +93,8 @@ jobs:
9293
working-directory: iperf
9394
run: |
9495
# Set up the environment for wolfProvider
95-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
96-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
97-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
96+
source $GITHUB_WORKSPACE/scripts/env-setup
9897
export ${{ matrix.force_fail }}
99-
export SHELL=/bin/bash
10098
10199
# Test variables for iperf
102100
export IPERF3_EXECUTABLE=$GITHUB_WORKSPACE/iperf/src/iperf3
@@ -108,11 +106,6 @@ jobs:
108106
export IPERF3_PASSWORD=rossi
109107
export KEY_DIR=$GITHUB_WORKSPACE/test-keys
110108
111-
# Verify OpenSSL loads wolfProvider to confirm configuration above
112-
echo "Checking OpenSSL providers:"
113-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
114-
grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
115-
116109
# Verify iperf loads OpenSSL containing wolfProvider
117110
ldd $IPERF3_LIB | grep -q wolfProvider
118111

‎.github/workflows/ipmitool.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
id: wolfprov-cache
4646
with:
4747
path: |
48+
scripts
4849
wolfssl-source
4950
wolfssl-install
5051
wolfprov-install
@@ -71,14 +72,9 @@ jobs:
7172
- name: Confirm built with OpenSSL and test with wolfProvider
7273
working-directory: ipmitool
7374
run: |
74-
# Setup environment variables
75-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
76-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
77-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
78-
79-
echo "Checking OpenSSL providers:"
80-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
81-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
75+
# Set up the environment for wolfProvider
76+
source $GITHUB_WORKSPACE/scripts/env-setup
77+
export ${{ matrix.force_fail }}
8278
8379
# Verify ipmitool was built and linked correctly with OpenSSL
8480
ldd src/ipmitool | grep -E '(libssl|libcrypto)'

‎.github/workflows/liboauth2.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
id: wolfprov-cache
4545
with:
4646
path: |
47+
scripts
4748
wolfssl-source
4849
wolfssl-install
4950
wolfprov-install
@@ -80,17 +81,10 @@ jobs:
8081
- name: Run liboauth2 tests
8182
working-directory: liboauth2
8283
run: |
83-
# Set environment variables
84-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
85-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
86-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
87-
export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/openssl-install/lib64/pkgconfig
84+
# Set up the environment for wolfProvider
85+
source $GITHUB_WORKSPACE/scripts/env-setup
8886
export ${{ matrix.force_fail }}
8987
90-
echo "Checking OpenSSL providers:"
91-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
92-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
93-
9488
# Build and run tests
9589
make check 2>&1 | tee liboauth2-test.log
9690
TEST_RESULT=$?

‎.github/workflows/multi-compiler.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
id: wolfprov-cache
7474
with:
7575
path: |
76+
scripts
7677
wolfssl-source
7778
wolfssl-install
7879
wolfprov-install

‎.github/workflows/net-snmp.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
id: wolfprov-cache
4747
with:
4848
path: |
49+
scripts
4950
wolfssl-source
5051
wolfssl-install
5152
wolfprov-install
@@ -77,15 +78,10 @@ jobs:
7778
- name: Run tests
7879
working-directory: net-snmp
7980
run: |
80-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
81-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
82-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
81+
# Set up the environment for wolfProvider
82+
source $GITHUB_WORKSPACE/scripts/env-setup
8383
export ${{ matrix.force_fail }}
8484
85-
echo "Checking OpenSSL providers:"
86-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
87-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
88-
8985
autoconf --version | grep -P '2\.\d\d' -o > dist/autoconf-version
9086
mkdir -p tests
9187
make -j test TESTOPTS="-e agentxperl" | tee tests/test.log

‎.github/workflows/nginx.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
id: wolfprov-cache
4949
with:
5050
path: |
51+
scripts
5152
wolfssl-source
5253
wolfssl-install
5354
wolfprov-install
@@ -84,16 +85,10 @@ jobs:
8485
- name: Run nginx-tests with wolfProvider
8586
working-directory: nginx-tests
8687
run: |
87-
# Set environment variables
88-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
89-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
90-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
88+
# Set up the environment for wolfProvider
89+
source $GITHUB_WORKSPACE/scripts/env-setup
9190
export ${{ matrix.force_fail }}
9291
93-
echo "Checking OpenSSL providers:"
94-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
95-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
96-
9792
# Run tests and save result
9893
TEST_NGINX_VERBOSE=y TEST_NGINX_CATLOG=y TEST_NGINX_BINARY=../nginx/objs/nginx prove -v . 2>&1 | tee nginx-test.log
9994
TEST_RESULT=$?

0 commit comments

Comments
 (0)