From 12311fc350debbd7af75e2c6aa0d19b923404b68 Mon Sep 17 00:00:00 2001 From: Paul Adelsbach Date: Sat, 20 Sep 2025 19:30:57 -0700 Subject: [PATCH 1/4] Build wolfssl debian --- .github/workflows/bind9.yml | 2 +- .github/workflows/build-wolfprovider.yml | 30 ++++++++++++------------ debian/install-wolfssl.sh | 6 ++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/bind9.yml b/.github/workflows/bind9.yml index e37eb4dc..0fb1fb1c 100644 --- a/.github/workflows/bind9.yml +++ b/.github/workflows/bind9.yml @@ -3,7 +3,7 @@ name: Bind9 Tests # START OF COMMON SECTION on: push: - branches: [ 'master', 'main', 'release/**' ] + branches: [ '*' ] #master', 'main', 'release/**' ] pull_request: branches: [ '*' ] diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml index f2316da3..49a8ebdf 100644 --- a/.github/workflows/build-wolfprovider.yml +++ b/.github/workflows/build-wolfprovider.yml @@ -115,21 +115,21 @@ jobs: # ls -la ${{ env.WOLFSSL_PACKAGES_PATH }} # apt install --reinstall -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*wolfssl*.deb - # # TODO: roll this step into utils-wolfssl.sh - # # TODO: specify tag below - # - name: Build wolfSSL packages and install - # # if: steps.wolfssl_cache.outputs.cache-hit != 'true' - # run: | - # # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} - # $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} - - # Unpack and install wolfSSL packages - - name: Unpack and install wolfSSL packages - run: | - mkdir -p ${{ env.WOLFSSL_PACKAGES_PATH }} - tar -xzf .github/packages/debian-wolfssl.tar.gz -C ${{ env.WOLFSSL_PACKAGES_PATH }} - mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }} - apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb + # TODO: roll this step into utils-wolfssl.sh + # TODO: specify tag below + - name: Build wolfSSL packages and install + # if: steps.wolfssl_cache.outputs.cache-hit != 'true' + run: | + # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} + $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} + + # # Unpack and install wolfSSL packages + # - name: Unpack and install wolfSSL packages + # run: | + # mkdir -p ${{ env.WOLFSSL_PACKAGES_PATH }} + # tar -xzf .github/packages/debian-wolfssl.tar.gz -C ${{ env.WOLFSSL_PACKAGES_PATH }} + # mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }} + # apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb # Check for cached OpenSSL packages - name: Checking OpenSSL packages in cache diff --git a/debian/install-wolfssl.sh b/debian/install-wolfssl.sh index 7e280bac..6e3624d6 100755 --- a/debian/install-wolfssl.sh +++ b/debian/install-wolfssl.sh @@ -117,9 +117,9 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac fi # Patch debian/rules.in to disable dh_strip - echo "Patching debian/rules.in to disable dh_strip..." - sed -i 's/^[[:space:]]*dh_strip.*/:/' debian/rules.in - echo "debian/rules.in patched successfully" + # echo "Patching debian/rules.in to disable dh_strip..." + # sed -i 's/^[[:space:]]*dh_strip.*/:/' debian/rules.in + # echo "debian/rules.in patched successfully" else echo "debian/rules.in found, using existing debian packaging" From bf3957b852ca65c2f8218c61ef54174e35446863 Mon Sep 17 00:00:00 2001 From: Paul Adelsbach Date: Mon, 22 Sep 2025 10:15:38 -0700 Subject: [PATCH 2/4] Port build flags from utils-wolfssl.sh --- .github/workflows/bind9.yml | 8 +++---- .github/workflows/build-wolfprovider.yml | 29 +++++++++++++++++------- .github/workflows/cjose.yml | 8 +++---- .github/workflows/cmdline.yml | 8 +++---- .github/workflows/codespell.yml | 8 +++---- .github/workflows/curl.yml | 8 +++---- .github/workflows/grpc.yml | 8 +++---- .github/workflows/iperf.yml | 8 +++---- .github/workflows/ipmitool.yml | 8 +++---- .github/workflows/krb5.yml | 8 +++---- .github/workflows/libcryptsetup.yml | 8 +++---- .github/workflows/libeac3.yml | 8 +++---- .github/workflows/libfido2.yml | 8 +++---- .github/workflows/libhashkit2.yml | 8 +++---- .github/workflows/libnice.yml | 8 +++---- .github/workflows/liboauth2.yml | 8 +++---- .github/workflows/libssh2.yml | 8 +++---- .github/workflows/libtss2.yml | 8 +++---- .github/workflows/libwebsockets.yml | 8 +++---- .github/workflows/multi-compiler.yml | 8 +++---- .github/workflows/net-snmp.yml | 8 +++---- .github/workflows/nginx.yml | 8 +++---- .github/workflows/opensc.yml | 8 +++---- .github/workflows/openssh.yml | 8 +++---- .github/workflows/pam-pkcs11.yml | 8 +++---- .github/workflows/ppp.yml | 8 +++---- .github/workflows/python3-ntp.yml | 8 +++---- .github/workflows/qt5network5.yml | 8 +++---- .github/workflows/rsync.yml | 8 +++---- .github/workflows/simple.yml | 8 +++---- .github/workflows/socat.yml | 8 +++---- .github/workflows/sscep.yml | 8 +++---- .github/workflows/sssd.yml | 8 +++---- .github/workflows/stunnel.yml | 8 +++---- .github/workflows/tcpdump.yml | 8 +++---- .github/workflows/tnftp.yml | 8 +++---- .github/workflows/tpm2-tools.yml | 8 +++---- debian/install-wolfssl.sh | 9 +++++++- scripts/utils-openssl.sh | 2 +- scripts/utils-wolfssl.sh | 2 ++ 40 files changed, 176 insertions(+), 154 deletions(-) diff --git a/.github/workflows/bind9.yml b/.github/workflows/bind9.yml index 0fb1fb1c..d5affb37 100644 --- a/.github/workflows/bind9.yml +++ b/.github/workflows/bind9.yml @@ -2,10 +2,10 @@ name: Bind9 Tests # START OF COMMON SECTION on: - push: - branches: [ '*' ] #master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml index 49a8ebdf..4ffc336e 100644 --- a/.github/workflows/build-wolfprovider.yml +++ b/.github/workflows/build-wolfprovider.yml @@ -117,11 +117,11 @@ jobs: # TODO: roll this step into utils-wolfssl.sh # TODO: specify tag below - - name: Build wolfSSL packages and install - # if: steps.wolfssl_cache.outputs.cache-hit != 'true' - run: | - # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} - $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} + # - name: Build wolfSSL packages and install + # # if: steps.wolfssl_cache.outputs.cache-hit != 'true' + # run: | + # # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} + # $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} # # Unpack and install wolfSSL packages # - name: Unpack and install wolfSSL packages @@ -171,9 +171,22 @@ jobs: cp $GITHUB_WORKSPACE/../libwolfprov*.tar.gz ${{ env.WOLFPROV_PACKAGES_PATH }} printf "Listing packages directory:\n" - ls -la ${{ env.WOLFPROV_PACKAGES_PATH }} - ls -la ${{ env.WOLFSSL_PACKAGES_PATH }} - ls -la ${{ env.OPENSSL_PACKAGES_PATH }} + ls -la ${{ env.WOLFPROV_PACKAGES_PATH }} || true + ls -la ${{ env.WOLFSSL_PACKAGES_PATH }} || true + ls -la ${{ env.OPENSSL_PACKAGES_PATH }} || true + + - name: Install openssl packages for include files + run: | + apt install --reinstall -y \ + ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \ + ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \ + ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb + + - name: Build wolfSSL packages and install + # if: steps.wolfssl_cache.outputs.cache-hit != 'true' + run: | + # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} + $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} - name: Save to cache uses: actions/cache/save@v4 diff --git a/.github/workflows/cjose.yml b/.github/workflows/cjose.yml index 7463248f..0b87b297 100644 --- a/.github/workflows/cjose.yml +++ b/.github/workflows/cjose.yml @@ -2,10 +2,10 @@ name: cjose Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/cmdline.yml b/.github/workflows/cmdline.yml index 959c3c37..7a052ce1 100644 --- a/.github/workflows/cmdline.yml +++ b/.github/workflows/cmdline.yml @@ -2,10 +2,10 @@ name: Command Line Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 374e61bc..59ab4c6d 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -2,10 +2,10 @@ name: Codespell test # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index 8647e7c4..e34a2990 100644 --- a/.github/workflows/curl.yml +++ b/.github/workflows/curl.yml @@ -2,10 +2,10 @@ name: Curl Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index 9d665d90..ae3733f7 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -2,10 +2,10 @@ name: gRPC Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/iperf.yml b/.github/workflows/iperf.yml index a8af6683..81c7feaa 100644 --- a/.github/workflows/iperf.yml +++ b/.github/workflows/iperf.yml @@ -2,10 +2,10 @@ name: iperf Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ipmitool.yml b/.github/workflows/ipmitool.yml index 3cf483c5..fe4cb8c0 100644 --- a/.github/workflows/ipmitool.yml +++ b/.github/workflows/ipmitool.yml @@ -2,10 +2,10 @@ name: IPMItool Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/krb5.yml b/.github/workflows/krb5.yml index 6f4b1f49..52cd8ae5 100644 --- a/.github/workflows/krb5.yml +++ b/.github/workflows/krb5.yml @@ -2,10 +2,10 @@ name: KRB5 Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libcryptsetup.yml b/.github/workflows/libcryptsetup.yml index a0a92663..3331fa17 100644 --- a/.github/workflows/libcryptsetup.yml +++ b/.github/workflows/libcryptsetup.yml @@ -2,10 +2,10 @@ name: Libcryptsetup Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libeac3.yml b/.github/workflows/libeac3.yml index f569a1d4..5cd4817f 100644 --- a/.github/workflows/libeac3.yml +++ b/.github/workflows/libeac3.yml @@ -2,10 +2,10 @@ name: libeac3 Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libfido2.yml b/.github/workflows/libfido2.yml index 64f346c0..015c92d7 100644 --- a/.github/workflows/libfido2.yml +++ b/.github/workflows/libfido2.yml @@ -1,9 +1,9 @@ name: libfido2 Tests on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/libhashkit2.yml b/.github/workflows/libhashkit2.yml index 2a3ee264..efe380e2 100644 --- a/.github/workflows/libhashkit2.yml +++ b/.github/workflows/libhashkit2.yml @@ -2,10 +2,10 @@ name: libhashkit2 Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libnice.yml b/.github/workflows/libnice.yml index cbbb2904..601d1ad7 100644 --- a/.github/workflows/libnice.yml +++ b/.github/workflows/libnice.yml @@ -2,10 +2,10 @@ name: libnice Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/liboauth2.yml b/.github/workflows/liboauth2.yml index 77b9eb21..79485685 100644 --- a/.github/workflows/liboauth2.yml +++ b/.github/workflows/liboauth2.yml @@ -2,10 +2,10 @@ name: liboauth2 Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libssh2.yml b/.github/workflows/libssh2.yml index 7845a5ba..27b93fe4 100644 --- a/.github/workflows/libssh2.yml +++ b/.github/workflows/libssh2.yml @@ -2,10 +2,10 @@ name: libssh2 Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libtss2.yml b/.github/workflows/libtss2.yml index 9d15ab90..c6a38fa3 100644 --- a/.github/workflows/libtss2.yml +++ b/.github/workflows/libtss2.yml @@ -1,9 +1,9 @@ name: tpm2-tss Tests on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/libwebsockets.yml b/.github/workflows/libwebsockets.yml index a87d29dd..2da735bd 100644 --- a/.github/workflows/libwebsockets.yml +++ b/.github/workflows/libwebsockets.yml @@ -2,10 +2,10 @@ name: libwebsockets Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/multi-compiler.yml b/.github/workflows/multi-compiler.yml index 8619977f..ea17a095 100644 --- a/.github/workflows/multi-compiler.yml +++ b/.github/workflows/multi-compiler.yml @@ -2,10 +2,10 @@ name: Multi-Compiler Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/net-snmp.yml b/.github/workflows/net-snmp.yml index 48744255..f216cd74 100644 --- a/.github/workflows/net-snmp.yml +++ b/.github/workflows/net-snmp.yml @@ -2,10 +2,10 @@ name: Net-SNMP Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 337e6392..7ce9a9e9 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -2,10 +2,10 @@ name: Nginx Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/opensc.yml b/.github/workflows/opensc.yml index c2e24233..9eba5436 100644 --- a/.github/workflows/opensc.yml +++ b/.github/workflows/opensc.yml @@ -2,10 +2,10 @@ name: OpenSC Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index ee438909..c2db5d37 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.yml @@ -2,10 +2,10 @@ name: openssh Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/pam-pkcs11.yml b/.github/workflows/pam-pkcs11.yml index bee0baca..29631432 100644 --- a/.github/workflows/pam-pkcs11.yml +++ b/.github/workflows/pam-pkcs11.yml @@ -2,10 +2,10 @@ name: pam-pkcs11 Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ppp.yml b/.github/workflows/ppp.yml index eb0ff574..9b7a7255 100644 --- a/.github/workflows/ppp.yml +++ b/.github/workflows/ppp.yml @@ -1,10 +1,10 @@ name: PPP Tests on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/python3-ntp.yml b/.github/workflows/python3-ntp.yml index 14f2db41..ee532634 100644 --- a/.github/workflows/python3-ntp.yml +++ b/.github/workflows/python3-ntp.yml @@ -2,10 +2,10 @@ name: python3-ntp Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/qt5network5.yml b/.github/workflows/qt5network5.yml index 3426a75c..ef056bd1 100644 --- a/.github/workflows/qt5network5.yml +++ b/.github/workflows/qt5network5.yml @@ -1,9 +1,9 @@ name: qtbase Network Tests on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/rsync.yml b/.github/workflows/rsync.yml index 80db7507..3d0d7331 100644 --- a/.github/workflows/rsync.yml +++ b/.github/workflows/rsync.yml @@ -1,9 +1,9 @@ name: rsync Tests on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml index 959ee8cf..324087de 100644 --- a/.github/workflows/simple.yml +++ b/.github/workflows/simple.yml @@ -2,10 +2,10 @@ name: Simple Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/socat.yml b/.github/workflows/socat.yml index 6bcb9e84..4da7c364 100644 --- a/.github/workflows/socat.yml +++ b/.github/workflows/socat.yml @@ -2,10 +2,10 @@ name: Socat Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/sscep.yml b/.github/workflows/sscep.yml index 09b07b80..bb0a6f97 100644 --- a/.github/workflows/sscep.yml +++ b/.github/workflows/sscep.yml @@ -2,10 +2,10 @@ name: sscep Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/sssd.yml b/.github/workflows/sssd.yml index af538233..d4760f0c 100644 --- a/.github/workflows/sssd.yml +++ b/.github/workflows/sssd.yml @@ -2,10 +2,10 @@ name: SSSD Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/stunnel.yml b/.github/workflows/stunnel.yml index fec7a22b..db20be2a 100644 --- a/.github/workflows/stunnel.yml +++ b/.github/workflows/stunnel.yml @@ -2,10 +2,10 @@ name: Stunnel Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/tcpdump.yml b/.github/workflows/tcpdump.yml index 0d821903..60e384f3 100644 --- a/.github/workflows/tcpdump.yml +++ b/.github/workflows/tcpdump.yml @@ -1,10 +1,10 @@ name: tcpdump Tests on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/tnftp.yml b/.github/workflows/tnftp.yml index f35b00f1..e345fe92 100644 --- a/.github/workflows/tnftp.yml +++ b/.github/workflows/tnftp.yml @@ -2,10 +2,10 @@ name: tnftp Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/tpm2-tools.yml b/.github/workflows/tpm2-tools.yml index 2ef148b1..4c84428b 100644 --- a/.github/workflows/tpm2-tools.yml +++ b/.github/workflows/tpm2-tools.yml @@ -2,10 +2,10 @@ name: tpm2-tools Tests # START OF COMMON SECTION on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] + push: [ '' ] +# branches: [ 'master', 'main', 'release/**' ] +# pull_request: +# branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/debian/install-wolfssl.sh b/debian/install-wolfssl.sh index 6e3624d6..4eeaa161 100755 --- a/debian/install-wolfssl.sh +++ b/debian/install-wolfssl.sh @@ -153,7 +153,11 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac --enable-shake256 \ --enable-wolfprovider \ --enable-rsapss \ - --enable-scrypt" + --enable-scrypt" \ + --enable-keylog-export \ + --enable-debug-trace-errcodes=backtrace" \ + --with-max-ecc-bits=1024" \ + --enable-sha if [ "$debug_mode" = "true" ]; then configure_opts="$configure_opts --enable-debug" @@ -180,6 +184,9 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac -DWC_RSA_NO_PADDING \ -DACVP_VECTOR_TESTING \ -DWOLFSSL_ECDSA_SET_K" \ + -DHAVE_PUBLIC_FFDHE \ + -DWOLFSSL_PSS_LONG_SALT \ + -DWOLFSSL_LOGGINGENABLED_DEFAULT=1 \ LIBS="-lm" # Build Debian packages diff --git a/scripts/utils-openssl.sh b/scripts/utils-openssl.sh index 3ae08236..a3bcd6a3 100755 --- a/scripts/utils-openssl.sh +++ b/scripts/utils-openssl.sh @@ -310,7 +310,7 @@ install_openssl() { } init_openssl() { - if [ $WOLFPROV_BUILD_DEBIAN -eq 1 ]; then + if [ "${WOLFPROV_BUILD_DEBIAN:-0}" -eq 1 ]; then install_openssl_deb else install_openssl diff --git a/scripts/utils-wolfssl.sh b/scripts/utils-wolfssl.sh index 2fc0c687..cbb43347 100644 --- a/scripts/utils-wolfssl.sh +++ b/scripts/utils-wolfssl.sh @@ -184,6 +184,8 @@ install_wolfssl() { cd XXX-fips-test fi + printf "Running ./configure with: ${CONF_ARGS} ${WOLFSSL_CONFIG_OPTS} CFLAGS=\"${WOLFSSL_CONFIG_CFLAGS}\"\n" + printf "Running ./configure with: ${CONF_ARGS} ${WOLFSSL_CONFIG_OPTS} CFLAGS=\"${WOLFSSL_CONFIG_CFLAGS}\"\n" >>$LOG_FILE 2>&1 ./configure ${CONF_ARGS} ${WOLFSSL_CONFIG_OPTS} CFLAGS="${WOLFSSL_CONFIG_CFLAGS}" >>$LOG_FILE 2>&1 if [ $? != 0 ]; then printf "ERROR running ./configure\n" From cd29784ec021afb53e398f6f71343bdb8b4cd6c1 Mon Sep 17 00:00:00 2001 From: Paul Adelsbach Date: Mon, 22 Sep 2025 11:07:07 -0700 Subject: [PATCH 3/4] Build openssl before wolfssl --- .github/workflows/build-wolfprovider.yml | 26 ++++++++++++------------ debian/install-wolfssl.sh | 12 +++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml index 4ffc336e..ff95f718 100644 --- a/.github/workflows/build-wolfprovider.yml +++ b/.github/workflows/build-wolfprovider.yml @@ -131,6 +131,19 @@ jobs: # mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }} # apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb + - name: Install baseline openssl + run: | + apt-get install --allow-downgrades --reinstall \ + libssl3=3.0.17-1~deb12u2 \ + libssl-dev=3.0.17-1~deb12u2 \ + openssl=3.0.17-1~deb12u2 + + - name: Build wolfSSL packages and install + # if: steps.wolfssl_cache.outputs.cache-hit != 'true' + run: | + # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} + $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} + # Check for cached OpenSSL packages - name: Checking OpenSSL packages in cache uses: actions/cache@v4 @@ -175,19 +188,6 @@ jobs: ls -la ${{ env.WOLFSSL_PACKAGES_PATH }} || true ls -la ${{ env.OPENSSL_PACKAGES_PATH }} || true - - name: Install openssl packages for include files - run: | - apt install --reinstall -y \ - ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \ - ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \ - ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb - - - name: Build wolfSSL packages and install - # if: steps.wolfssl_cache.outputs.cache-hit != 'true' - run: | - # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} - $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} - - name: Save to cache uses: actions/cache/save@v4 continue-on-error: true diff --git a/debian/install-wolfssl.sh b/debian/install-wolfssl.sh index 4eeaa161..06eb2c01 100755 --- a/debian/install-wolfssl.sh +++ b/debian/install-wolfssl.sh @@ -153,11 +153,11 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac --enable-shake256 \ --enable-wolfprovider \ --enable-rsapss \ - --enable-scrypt" \ + --enable-scrypt \ --enable-keylog-export \ - --enable-debug-trace-errcodes=backtrace" \ - --with-max-ecc-bits=1024" \ - --enable-sha + --enable-debug-trace-errcodes=backtrace \ + --with-max-ecc-bits=1024 \ + --enable-sha" if [ "$debug_mode" = "true" ]; then configure_opts="$configure_opts --enable-debug" @@ -183,10 +183,10 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac -DWC_RSA_DIRECT \ -DWC_RSA_NO_PADDING \ -DACVP_VECTOR_TESTING \ - -DWOLFSSL_ECDSA_SET_K" \ + -DWOLFSSL_ECDSA_SET_K \ -DHAVE_PUBLIC_FFDHE \ -DWOLFSSL_PSS_LONG_SALT \ - -DWOLFSSL_LOGGINGENABLED_DEFAULT=1 \ + -DWOLFSSL_LOGGINGENABLED_DEFAULT=1" \ LIBS="-lm" # Build Debian packages From 57ead95c22630824e821486e637fbfaac5fbce81 Mon Sep 17 00:00:00 2001 From: Paul Adelsbach Date: Mon, 22 Sep 2025 11:20:34 -0700 Subject: [PATCH 4/4] Still trying to fix passing yamls --- .github/workflows/build-wolfprovider.yml | 49 +++++++++++------------ .github/workflows/cjose.yml | 8 ++-- .github/workflows/cmdline.yml | 8 ++-- .github/workflows/codespell.yml | 8 ++-- .github/workflows/curl.yml | 8 ++-- .github/workflows/grpc.yml | 8 ++-- .github/workflows/iperf.yml | 8 ++-- .github/workflows/ipmitool.yml | 8 ++-- .github/workflows/krb5.yml | 8 ++-- .github/workflows/libcryptsetup.yml | 8 ++-- .github/workflows/libeac3.yml | 8 ++-- .github/workflows/libfido2.yml | 8 ++-- .github/workflows/libhashkit2.yml | 8 ++-- .github/workflows/libnice.yml | 8 ++-- .github/workflows/liboauth2.yml | 8 ++-- .github/workflows/libssh2.yml | 8 ++-- .github/workflows/libtss2.yml | 8 ++-- .github/workflows/libwebsockets.yml | 8 ++-- .github/workflows/multi-compiler.yml | 8 ++-- .github/workflows/net-snmp.yml | 8 ++-- .github/workflows/nginx.yml | 8 ++-- .github/workflows/opensc.yml | 8 ++-- .github/workflows/openssh.yml | 8 ++-- .github/workflows/pam-pkcs11.yml | 8 ++-- .github/workflows/ppp.yml | 8 ++-- .github/workflows/python3-ntp.yml | 8 ++-- .github/workflows/qt5network5.yml | 8 ++-- .github/workflows/rsync.yml | 8 ++-- .github/workflows/simple.yml | 51 ++---------------------- .github/workflows/socat.yml | 8 ++-- .github/workflows/sscep.yml | 8 ++-- .github/workflows/sssd.yml | 8 ++-- .github/workflows/stunnel.yml | 8 ++-- .github/workflows/tcpdump.yml | 8 ++-- .github/workflows/tnftp.yml | 8 ++-- .github/workflows/tpm2-tools.yml | 8 ++-- 36 files changed, 164 insertions(+), 208 deletions(-) diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml index ff95f718..b6b4c01c 100644 --- a/.github/workflows/build-wolfprovider.yml +++ b/.github/workflows/build-wolfprovider.yml @@ -35,7 +35,6 @@ jobs: run: | apt-get update && apt-get install -y --no-install-recommends \ build-essential \ - ccache \ devscripts \ debhelper \ dh-autoreconf \ @@ -55,31 +54,31 @@ jobs: xxd # Experimental: use ccache - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1.2 - id: cc - with: - create-symlink: true + # - name: Setup ccache + # uses: hendrikmuhs/ccache-action@v1.2 + # id: cc + # with: + # create-symlink: true - - name: Setup ccache environment variables - run: | - echo CC=ccache\ gcc >> "$GITHUB_ENV" - echo CXX=ccache\ g++ >> "$GITHUB_ENV" - echo CCACHE_BASEDIR=${GITHUB_WORKSPACE} >> "$GITHUB_ENV" - echo CCACHE_NOHASHDIR=true >> "$GITHUB_ENV" - echo CCACHE_COMPILERCHECK=content >> "$GITHUB_ENV" - echo "CCACHE_DIR=${XDG_CACHE_HOME:-$HOME/.cache}/ccache" >> "$GITHUB_ENV" - mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/ccache" - - - name: Sanity check ccache routing - run: | - set -x - which -a gcc || true - gcc --version | head -1 - ccache --zero-stats - printf 'int main(){return 0;}\n' > t.c - $CC -c t.c - ccache -s + # - name: Setup ccache environment variables + # run: | + # echo CC=ccache\ gcc >> "$GITHUB_ENV" + # echo CXX=ccache\ g++ >> "$GITHUB_ENV" + # echo CCACHE_BASEDIR=${GITHUB_WORKSPACE} >> "$GITHUB_ENV" + # echo CCACHE_NOHASHDIR=true >> "$GITHUB_ENV" + # echo CCACHE_COMPILERCHECK=content >> "$GITHUB_ENV" + # echo "CCACHE_DIR=${XDG_CACHE_HOME:-$HOME/.cache}/ccache" >> "$GITHUB_ENV" + # mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/ccache" + + # - name: Sanity check ccache routing + # run: | + # set -x + # which -a gcc || true + # gcc --version | head -1 + # ccache --zero-stats + # printf 'int main(){return 0;}\n' > t.c + # $CC -c t.c + # ccache -s - name: Checkout wolfProvider uses: actions/checkout@v4 diff --git a/.github/workflows/cjose.yml b/.github/workflows/cjose.yml index 0b87b297..7463248f 100644 --- a/.github/workflows/cjose.yml +++ b/.github/workflows/cjose.yml @@ -2,10 +2,10 @@ name: cjose Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/cmdline.yml b/.github/workflows/cmdline.yml index 7a052ce1..959c3c37 100644 --- a/.github/workflows/cmdline.yml +++ b/.github/workflows/cmdline.yml @@ -2,10 +2,10 @@ name: Command Line Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 59ab4c6d..374e61bc 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -2,10 +2,10 @@ name: Codespell test # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index e34a2990..8647e7c4 100644 --- a/.github/workflows/curl.yml +++ b/.github/workflows/curl.yml @@ -2,10 +2,10 @@ name: Curl Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index ae3733f7..9d665d90 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -2,10 +2,10 @@ name: gRPC Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/iperf.yml b/.github/workflows/iperf.yml index 81c7feaa..a8af6683 100644 --- a/.github/workflows/iperf.yml +++ b/.github/workflows/iperf.yml @@ -2,10 +2,10 @@ name: iperf Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ipmitool.yml b/.github/workflows/ipmitool.yml index fe4cb8c0..3cf483c5 100644 --- a/.github/workflows/ipmitool.yml +++ b/.github/workflows/ipmitool.yml @@ -2,10 +2,10 @@ name: IPMItool Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/krb5.yml b/.github/workflows/krb5.yml index 52cd8ae5..6f4b1f49 100644 --- a/.github/workflows/krb5.yml +++ b/.github/workflows/krb5.yml @@ -2,10 +2,10 @@ name: KRB5 Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libcryptsetup.yml b/.github/workflows/libcryptsetup.yml index 3331fa17..a0a92663 100644 --- a/.github/workflows/libcryptsetup.yml +++ b/.github/workflows/libcryptsetup.yml @@ -2,10 +2,10 @@ name: Libcryptsetup Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libeac3.yml b/.github/workflows/libeac3.yml index 5cd4817f..f569a1d4 100644 --- a/.github/workflows/libeac3.yml +++ b/.github/workflows/libeac3.yml @@ -2,10 +2,10 @@ name: libeac3 Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libfido2.yml b/.github/workflows/libfido2.yml index 015c92d7..64f346c0 100644 --- a/.github/workflows/libfido2.yml +++ b/.github/workflows/libfido2.yml @@ -1,9 +1,9 @@ name: libfido2 Tests on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/libhashkit2.yml b/.github/workflows/libhashkit2.yml index efe380e2..2a3ee264 100644 --- a/.github/workflows/libhashkit2.yml +++ b/.github/workflows/libhashkit2.yml @@ -2,10 +2,10 @@ name: libhashkit2 Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libnice.yml b/.github/workflows/libnice.yml index 601d1ad7..cbbb2904 100644 --- a/.github/workflows/libnice.yml +++ b/.github/workflows/libnice.yml @@ -2,10 +2,10 @@ name: libnice Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/liboauth2.yml b/.github/workflows/liboauth2.yml index 79485685..77b9eb21 100644 --- a/.github/workflows/liboauth2.yml +++ b/.github/workflows/liboauth2.yml @@ -2,10 +2,10 @@ name: liboauth2 Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libssh2.yml b/.github/workflows/libssh2.yml index 27b93fe4..7845a5ba 100644 --- a/.github/workflows/libssh2.yml +++ b/.github/workflows/libssh2.yml @@ -2,10 +2,10 @@ name: libssh2 Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/libtss2.yml b/.github/workflows/libtss2.yml index c6a38fa3..9d15ab90 100644 --- a/.github/workflows/libtss2.yml +++ b/.github/workflows/libtss2.yml @@ -1,9 +1,9 @@ name: tpm2-tss Tests on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/libwebsockets.yml b/.github/workflows/libwebsockets.yml index 2da735bd..a87d29dd 100644 --- a/.github/workflows/libwebsockets.yml +++ b/.github/workflows/libwebsockets.yml @@ -2,10 +2,10 @@ name: libwebsockets Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/multi-compiler.yml b/.github/workflows/multi-compiler.yml index ea17a095..8619977f 100644 --- a/.github/workflows/multi-compiler.yml +++ b/.github/workflows/multi-compiler.yml @@ -2,10 +2,10 @@ name: Multi-Compiler Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/net-snmp.yml b/.github/workflows/net-snmp.yml index f216cd74..48744255 100644 --- a/.github/workflows/net-snmp.yml +++ b/.github/workflows/net-snmp.yml @@ -2,10 +2,10 @@ name: Net-SNMP Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 7ce9a9e9..337e6392 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -2,10 +2,10 @@ name: Nginx Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/opensc.yml b/.github/workflows/opensc.yml index 9eba5436..c2e24233 100644 --- a/.github/workflows/opensc.yml +++ b/.github/workflows/opensc.yml @@ -2,10 +2,10 @@ name: OpenSC Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index c2db5d37..ee438909 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.yml @@ -2,10 +2,10 @@ name: openssh Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/pam-pkcs11.yml b/.github/workflows/pam-pkcs11.yml index 29631432..bee0baca 100644 --- a/.github/workflows/pam-pkcs11.yml +++ b/.github/workflows/pam-pkcs11.yml @@ -2,10 +2,10 @@ name: pam-pkcs11 Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ppp.yml b/.github/workflows/ppp.yml index 9b7a7255..eb0ff574 100644 --- a/.github/workflows/ppp.yml +++ b/.github/workflows/ppp.yml @@ -1,10 +1,10 @@ name: PPP Tests on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/python3-ntp.yml b/.github/workflows/python3-ntp.yml index ee532634..14f2db41 100644 --- a/.github/workflows/python3-ntp.yml +++ b/.github/workflows/python3-ntp.yml @@ -2,10 +2,10 @@ name: python3-ntp Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/qt5network5.yml b/.github/workflows/qt5network5.yml index ef056bd1..3426a75c 100644 --- a/.github/workflows/qt5network5.yml +++ b/.github/workflows/qt5network5.yml @@ -1,9 +1,9 @@ name: qtbase Network Tests on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/rsync.yml b/.github/workflows/rsync.yml index 3d0d7331..80db7507 100644 --- a/.github/workflows/rsync.yml +++ b/.github/workflows/rsync.yml @@ -1,9 +1,9 @@ name: rsync Tests on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml index 324087de..4684df90 100644 --- a/.github/workflows/simple.yml +++ b/.github/workflows/simple.yml @@ -2,10 +2,10 @@ name: Simple Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -13,28 +13,6 @@ concurrency: # END OF COMMON SECTION jobs: - build_wolfprovider: - uses: ./.github/workflows/build-wolfprovider.yml - with: - wolfssl_ref: ${{ matrix.wolfssl_ref }} - openssl_ref: ${{ matrix.openssl_ref }} - strategy: - matrix: - wolfssl_ref: [ - 'master', - 'v5.8.2-stable', - 'v5.8.0-stable'] - # Test against the newest of each minor version - openssl_ref: [ - 'openssl-3.5.2', - 'openssl-3.4.2', - 'openssl-3.3.4', - 'openssl-3.2.5', - 'openssl-3.1.8', - 'openssl-3.0.17'] - force_fail: ['WOLFPROV_FORCE_FAIL=1', ''] - debug: ['WOLFPROV_DEBUG=1', ''] - simple_test: name: Simple Test runs-on: ubuntu-22.04 @@ -62,28 +40,7 @@ jobs: with: fetch-depth: 1 - - name: Retrieving wolfProvider from cache - # Debug builds are not currently supported by build-wolfprovider.yml - # so those are manually built as a separate step. - if: ${{ matrix.debug == '' }} - uses: actions/cache/restore@v4 - id: wolfprov-cache-restore - with: - path: | - wolfssl-install - wolfprov-install - openssl-install/lib64 - openssl-install/include - openssl-install/bin - - key: wolfprov-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }} - # Normally we would fail on cache miss, but we rebuild below - # for the DEBUG build. - fail-on-cache-miss: false - - name: Build and test wolfProvider - # Only run the test for a cache miss. On hit, we've already run the test. - if: steps.wolfprov-cache-restore.cache-hit != 'true' run: | ${{ matrix.debug }} \ OPENSSL_TAG=${{ matrix.openssl_ref }} \ diff --git a/.github/workflows/socat.yml b/.github/workflows/socat.yml index 4da7c364..6bcb9e84 100644 --- a/.github/workflows/socat.yml +++ b/.github/workflows/socat.yml @@ -2,10 +2,10 @@ name: Socat Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/sscep.yml b/.github/workflows/sscep.yml index bb0a6f97..09b07b80 100644 --- a/.github/workflows/sscep.yml +++ b/.github/workflows/sscep.yml @@ -2,10 +2,10 @@ name: sscep Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/sssd.yml b/.github/workflows/sssd.yml index d4760f0c..af538233 100644 --- a/.github/workflows/sssd.yml +++ b/.github/workflows/sssd.yml @@ -2,10 +2,10 @@ name: SSSD Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/stunnel.yml b/.github/workflows/stunnel.yml index db20be2a..fec7a22b 100644 --- a/.github/workflows/stunnel.yml +++ b/.github/workflows/stunnel.yml @@ -2,10 +2,10 @@ name: Stunnel Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/tcpdump.yml b/.github/workflows/tcpdump.yml index 60e384f3..0d821903 100644 --- a/.github/workflows/tcpdump.yml +++ b/.github/workflows/tcpdump.yml @@ -1,10 +1,10 @@ name: tcpdump Tests on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/tnftp.yml b/.github/workflows/tnftp.yml index e345fe92..f35b00f1 100644 --- a/.github/workflows/tnftp.yml +++ b/.github/workflows/tnftp.yml @@ -2,10 +2,10 @@ name: tnftp Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/tpm2-tools.yml b/.github/workflows/tpm2-tools.yml index 4c84428b..2ef148b1 100644 --- a/.github/workflows/tpm2-tools.yml +++ b/.github/workflows/tpm2-tools.yml @@ -2,10 +2,10 @@ name: tpm2-tools Tests # START OF COMMON SECTION on: - push: [ '' ] -# branches: [ 'master', 'main', 'release/**' ] -# pull_request: -# branches: [ '*' ] + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] concurrency: group: ${{ github.workflow }}-${{ github.ref }}