Skip to content

Commit 6a3de14

Browse files
padelsbachpadelsbach
committed
Add setup-env script to set provider environment variables
1 parent 01a48e3 commit 6a3de14

18 files changed

Lines changed: 107 additions & 117 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: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
id: wolfprov-cache
5959
with:
6060
path: |
61+
scripts
6162
wolfssl-source
6263
wolfssl-install
6364
wolfprov-install
@@ -83,7 +84,7 @@ jobs:
8384
working-directory: cjose
8485
run: |
8586
# Configure with OpenSSL
86-
./configure CFLAGS="-Wno-error=deprecated-declarations" --with-openssl=/git/wolfProvider/openssl-install
87+
./configure CFLAGS="-Wno-error=deprecated-declarations" --with-openssl=/git/wolfProvider/openssl-install
8788
8889
# Build cjose
8990
make
@@ -92,15 +93,8 @@ jobs:
9293
working-directory: cjose
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
100-
101-
echo "Checking OpenSSL providers:"
102-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
103-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
10498
10599
# Run tests
106100
make test || true

‎.github/workflows/curl.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
id: wolfprov-cache
5858
with:
5959
path: |
60+
scripts
6061
wolfssl-source
6162
wolfssl-install
6263
wolfprov-install
@@ -90,18 +91,11 @@ jobs:
9091
- name: Test curl with wolfProvider
9192
working-directory: curl
9293
run: |
93-
# Set environment variables
94-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
95-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
96-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
97-
export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/openssl-install/lib64/pkgconfig
94+
# Set up the environment for wolfProvider
95+
source $GITHUB_WORKSPACE/scripts/env-setup
9896
export ${{ matrix.force_fail }}
9997
export CURL_REF=${{ matrix.curl_ref }}
10098
101-
echo "Checking OpenSSL providers:"
102-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
103-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
104-
10599
# Run tests and save output to test.log
106100
mkdir -p tests
107101
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
@@ -61,6 +61,7 @@ jobs:
6161
id: wolfprov-cache
6262
with:
6363
path: |
64+
scripts
6465
wolfssl-source
6566
wolfssl-install
6667
wolfprov-install
@@ -94,14 +95,9 @@ jobs:
9495
- name: Build grpc with wolfProvider
9596
working-directory: ./grpc
9697
run: |
97-
# Setup environment for wolfProviders
98-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
99-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
100-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
101-
102-
echo "Checking OpenSSL providers:"
103-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
104-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
98+
# Set up the environment for wolfProvider
99+
source $GITHUB_WORKSPACE/scripts/env-setup
100+
export ${{ matrix.force_fail }}
105101
106102
# Initialize submodules
107103
git submodule update --init

‎.github/workflows/iperf.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
id: wolfprov-cache
5555
with:
5656
path: |
57+
scripts
5758
wolfssl-source
5859
wolfssl-install
5960
wolfprov-install
@@ -100,11 +101,8 @@ jobs:
100101
working-directory: iperf
101102
run: |
102103
# Set up the environment for wolfProvider
103-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
104-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
105-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
104+
source $GITHUB_WORKSPACE/scripts/env-setup
106105
export ${{ matrix.force_fail }}
107-
export SHELL=/bin/bash
108106
109107
# Test variables for iperf
110108
export IPERF3_EXECUTABLE=$GITHUB_WORKSPACE/iperf/src/iperf3
@@ -116,11 +114,6 @@ jobs:
116114
export IPERF3_PASSWORD=rossi
117115
export KEY_DIR=$GITHUB_WORKSPACE/test-keys
118116
119-
# Verify OpenSSL loads wolfProvider to confirm configuration above
120-
echo "Checking OpenSSL providers:"
121-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
122-
grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
123-
124117
# Verify iperf loads OpenSSL containing wolfProvider
125118
ldd $IPERF3_LIB | grep -q wolfProvider
126119

‎.github/workflows/ipmitool.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
id: wolfprov-cache
5555
with:
5656
path: |
57+
scripts
5758
wolfssl-source
5859
wolfssl-install
5960
wolfprov-install
@@ -79,14 +80,9 @@ jobs:
7980
- name: Confirm built with OpenSSL and test with wolfProvider
8081
working-directory: ipmitool
8182
run: |
82-
# Setup environment variables
83-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
84-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
85-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
86-
87-
echo "Checking OpenSSL providers:"
88-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
89-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
83+
# Set up the environment for wolfProvider
84+
source $GITHUB_WORKSPACE/scripts/env-setup
85+
export ${{ matrix.force_fail }}
9086
9187
# Verify ipmitool was built and linked correctly with OpenSSL
9288
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
@@ -53,6 +53,7 @@ jobs:
5353
id: wolfprov-cache
5454
with:
5555
path: |
56+
scripts
5657
wolfssl-source
5758
wolfssl-install
5859
wolfprov-install
@@ -88,17 +89,10 @@ jobs:
8889
- name: Run liboauth2 tests
8990
working-directory: liboauth2
9091
run: |
91-
# Set environment variables
92-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
93-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
94-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
95-
export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/openssl-install/lib64/pkgconfig
92+
# Set up the environment for wolfProvider
93+
source $GITHUB_WORKSPACE/scripts/env-setup
9694
export ${{ matrix.force_fail }}
9795
98-
echo "Checking OpenSSL providers:"
99-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
100-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
101-
10296
# Build and run tests
10397
make check 2>&1 | tee liboauth2-test.log
10498
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
@@ -55,6 +55,7 @@ jobs:
5555
id: wolfprov-cache
5656
with:
5757
path: |
58+
scripts
5859
wolfssl-source
5960
wolfssl-install
6061
wolfprov-install
@@ -85,15 +86,10 @@ jobs:
8586
- name: Run tests
8687
working-directory: net-snmp
8788
run: |
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
89+
# Set up the environment for wolfProvider
90+
source $GITHUB_WORKSPACE/scripts/env-setup
9191
export ${{ matrix.force_fail }}
9292
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-
9793
autoconf --version | grep -P '2\.\d\d' -o > dist/autoconf-version
9894
mkdir -p tests
9995
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
@@ -57,6 +57,7 @@ jobs:
5757
id: wolfprov-cache
5858
with:
5959
path: |
60+
scripts
6061
wolfssl-source
6162
wolfssl-install
6263
wolfprov-install
@@ -92,16 +93,10 @@ jobs:
9293
- name: Run nginx-tests with wolfProvider
9394
working-directory: nginx-tests
9495
run: |
95-
# Set environment variables
96-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
97-
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
98-
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
96+
# Set up the environment for wolfProvider
97+
source $GITHUB_WORKSPACE/scripts/env-setup
9998
export ${{ matrix.force_fail }}
10099
101-
echo "Checking OpenSSL providers:"
102-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
103-
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
104-
105100
# Run tests and save result
106101
TEST_NGINX_VERBOSE=y TEST_NGINX_CATLOG=y TEST_NGINX_BINARY=../nginx/objs/nginx prove -v . 2>&1 | tee nginx-test.log
107102
TEST_RESULT=$?

0 commit comments

Comments
 (0)