Skip to content

Commit 2814d6a

Browse files
padelsbachpadelsbach
committed
Fix WPFF CI failures
1 parent 5d16735 commit 2814d6a

40 files changed

Lines changed: 216 additions & 12 deletions

‎.github/workflows/bind9.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ jobs:
7474
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7575
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7676
77+
# Prevent later 'apt-get install' of test dependencies from
78+
# replacing the wolfprov-patched libssl3, which breaks
79+
# replace-default mode.
80+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
81+
7782
- name: Verify wolfProvider is properly installed
7883
run: |
7984
$GITHUB_WORKSPACE/scripts/verify-install.sh \

‎.github/workflows/cjose.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ jobs:
8181
apt install --reinstall -y \
8282
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8383
84+
# Prevent later 'apt-get install' of test dependencies from
85+
# replacing the wolfprov-patched libssl3, which breaks
86+
# replace-default mode.
87+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
88+
8489
- name: Verify wolfProvider is properly installed
8590
run: |
8691
$GITHUB_WORKSPACE/scripts/verify-install.sh \

‎.github/workflows/curl.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ jobs:
7373
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7474
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7575
76+
# Prevent later 'apt-get install' of test dependencies from
77+
# replacing the wolfprov-patched libssl3, which breaks
78+
# replace-default mode.
79+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
80+
7681
- name: Verify wolfProvider is properly installed
7782
run: |
7883
$GITHUB_WORKSPACE/scripts/verify-install.sh \

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ jobs:
8585
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8686
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8787
88+
# Prevent later 'apt-get install' of test dependencies from
89+
# replacing the wolfprov-patched libssl3, which breaks
90+
# replace-default mode.
91+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
92+
8893
# In standalone mode, use OPENSSL_CONF to enable wolfProvider.
8994
if [ "${{ matrix.replace_default }}" = "false" ]; then
9095
echo "Setting OPENSSL_CONF to /etc/ssl/openssl.cnf.d/wolfprovider.conf"
@@ -108,6 +113,11 @@ jobs:
108113
109114
- name: Uninstall package and verify cleanup
110115
run: |
116+
# libwolfprov was held earlier to prevent transitive libssl3
117+
# upgrades from clobbering the wolfprov-patched libssl3. Release
118+
# the hold here so apt-get is allowed to remove it.
119+
apt-mark unhold libwolfprov || true
120+
111121
# Uninstall the package
112122
apt-get remove -y libwolfprov
113123

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ jobs:
7373
apt install --reinstall -y \
7474
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7575
76+
# Prevent later 'apt-get install' of test dependencies from
77+
# replacing the wolfprov-patched libssl3, which breaks
78+
# replace-default mode.
79+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
80+
7681
- name: Verify wolfProvider is properly installed
7782
run: |
7883
$GITHUB_WORKSPACE/scripts/verify-install.sh \

‎.github/workflows/grpc.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ jobs:
8181
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8282
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8383
84+
# Prevent later 'apt-get install' of test dependencies from
85+
# replacing the wolfprov-patched libssl3, which breaks
86+
# replace-default mode.
87+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
88+
8489
- name: Verify wolfProvider is properly installed
8590
run: |
8691
$GITHUB_WORKSPACE/scripts/verify-install.sh \

‎.github/workflows/hostap.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ jobs:
7777
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7878
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7979
80+
# Prevent later 'apt-get install' of test dependencies from
81+
# replacing the wolfprov-patched libssl3, which breaks
82+
# replace-default mode.
83+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
84+
8085
- name: Show OpenSSL version
8186
run: |
8287
echo "OpenSSL version:"

‎.github/workflows/iperf.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ jobs:
7373
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7474
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7575
76+
# Prevent later 'apt-get install' of test dependencies from
77+
# replacing the wolfprov-patched libssl3, which breaks
78+
# replace-default mode.
79+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
80+
7681
- name: Verify wolfProvider is properly installed
7782
run: |
7883
$GITHUB_WORKSPACE/scripts/verify-install.sh \

‎.github/workflows/krb5.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ jobs:
7373
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7474
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7575
76+
# Prevent later 'apt-get install' of test dependencies from
77+
# replacing the wolfprov-patched libssl3, which breaks
78+
# replace-default mode.
79+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
80+
7681
- name: Verify wolfProvider is properly installed
7782
run: |
7883
$GITHUB_WORKSPACE/scripts/verify-install.sh \

‎.github/workflows/libcryptsetup.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ jobs:
7575
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7676
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7777
78+
# Prevent later 'apt-get install' of test dependencies from
79+
# replacing the wolfprov-patched libssl3, which breaks
80+
# replace-default mode.
81+
apt-mark hold libssl3 libssl-dev openssl libwolfssl libwolfprov
82+
7883
- name: Verify wolfProvider is properly installed
7984
run: |
8085
$GITHUB_WORKSPACE/scripts/verify-install.sh \

0 commit comments

Comments
 (0)