Skip to content

Commit c7b166e

Browse files
ColtonWilleyColtonWilley
authored
Merge pull request #309 from padelsbach/wp-separate-debs
Move wolfssl and openssl package builds to separate flow
2 parents 739e502 + 345cb9c commit c7b166e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+670
-523
lines changed

‎.github/workflows/bind9.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ jobs:
7272
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7373
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7474
75-
apt install --reinstall -y \
75+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7676
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7777
78-
apt install --reinstall -y \
78+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7979
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
8080
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8181
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8282
83-
apt install --reinstall -y \
83+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8484
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8585
8686
- name: Verify wolfProvider is properly installed

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

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
equivs \
5353
expect \
5454
xxd \
55+
bc \
5556
libdistro-info-perl
5657
5758
- name: Checkout wolfProvider
@@ -71,31 +72,20 @@ jobs:
7172
git remote add upstream https://github.com/wolfSSL/wolfProvider.git || true
7273
git fetch upstream --tags --no-recurse-submodules
7374
74-
# Build wolfSSL packages and install
75-
# Note we do not use the cache currently. This is a future optimization.
76-
# TODO: roll this step into utils-wolfssl.sh
77-
- name: Build wolfSSL packages and install
78-
run: |
75+
- name: Install wolfSSL
76+
run: |
7977
$GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }}
8078
81-
- name: Build wolfProvider
79+
- name: Install OpenSSL
8280
run: |
83-
WOLFSSL_TAG=${{ inputs.wolfssl_ref }} OPENSSL_TAG=${{ inputs.openssl_ref }} \
84-
yes "Y" | $GITHUB_WORKSPACE/scripts/build-wolfprovider.sh --debian \
85-
${{ inputs.replace_default && '--replace-default' || '' }}
81+
$GITHUB_WORKSPACE/debian/install-openssl.sh ${{ inputs.replace_default && '--replace-default' || '' }} ${{ env.OPENSSL_PACKAGES_PATH }}
8682
87-
- name: Setup packages directory
83+
- name: Install wolfProvider
8884
run: |
89-
mkdir -p ${{ env.OPENSSL_PACKAGES_PATH }}
90-
cp $GITHUB_WORKSPACE/../openssl*.deb ${{ env.OPENSSL_PACKAGES_PATH }}
91-
cp $GITHUB_WORKSPACE/../libssl*.deb ${{ env.OPENSSL_PACKAGES_PATH }}
92-
93-
mkdir -p ${{ env.WOLFPROV_PACKAGES_PATH }}
94-
cp $GITHUB_WORKSPACE/../libwolfprov*.deb ${{ env.WOLFPROV_PACKAGES_PATH }}
95-
cp $GITHUB_WORKSPACE/../libwolfprov*.dsc ${{ env.WOLFPROV_PACKAGES_PATH }}
96-
cp $GITHUB_WORKSPACE/../libwolfprov*.tar.gz ${{ env.WOLFPROV_PACKAGES_PATH }}
85+
$GITHUB_WORKSPACE/debian/install-wolfprov.sh ${{ env.WOLFPROV_PACKAGES_PATH }}
9786
98-
printf "Listing packages directory:\n"
87+
- name: List packages directories
88+
run: |
9989
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
10090
ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
10191
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}

‎.github/workflows/cjose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: cjose Tests
33
# START OF COMMON SECTION
44
on:
55
push:
6-
branches: [ 'master', 'main', 'release/**' ]
6+
branches: ['*'] #[ 'master', 'main', 'release/**' ]
77
pull_request:
88
branches: [ '*' ]
99

@@ -79,15 +79,15 @@ jobs:
7979
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
8080
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
8181
82-
apt install --reinstall -y \
82+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8383
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
8484
85-
apt install --reinstall -y \
85+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8686
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
8787
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8888
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8989
90-
apt install --reinstall -y \
90+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
9191
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
9292
9393
- name: Verify wolfProvider is properly installed

‎.github/workflows/curl.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7272
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7373
74-
apt install --reinstall -y \
74+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7575
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7676
77-
apt install --reinstall -y \
77+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7878
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
7979
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8080
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8181
82-
apt install --reinstall -y \
82+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8383
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8484
8585
- name: Verify wolfProvider is properly installed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ jobs:
6969
ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
7070
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7171
72-
apt install --reinstall -y \
72+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7373
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7474
7575
apt-get update && \
7676
apt install --reinstall -y openssl libssl3
7777
78-
apt install --reinstall -y \
78+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7979
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8080
8181
- name: Verify wolfProvider is properly installed
@@ -223,10 +223,10 @@ jobs:
223223
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
224224
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
225225
226-
apt install --reinstall -y \
226+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
227227
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
228228
229-
apt install --reinstall -y \
229+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
230230
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
231231
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
232232
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
@@ -254,7 +254,7 @@ jobs:
254254
255255
- name: Install libwolfprov package
256256
run: |
257-
apt install --reinstall -y \
257+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
258258
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
259259
260260
echo "Installed packages after wolfprov:"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7272
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7373
74-
apt install --reinstall -y \
74+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7575
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7676
77-
apt install --reinstall -y \
77+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7878
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
7979
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8080
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8181
82-
apt install --reinstall -y \
82+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8383
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8484
8585
- name: Verify wolfProvider is properly installed

‎.github/workflows/grpc.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ jobs:
7878
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7979
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
8080
81-
apt install --reinstall -y \
81+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8282
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
8383
84-
apt install --reinstall -y \
84+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8585
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
8686
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8787
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8888
89-
apt install --reinstall -y \
89+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
9090
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
9191
9292
- name: Verify wolfProvider is properly installed

‎.github/workflows/hostap.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ jobs:
7373
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7474
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7575
76-
apt install --reinstall -y \
76+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7777
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7878
79-
apt install --reinstall -y \
79+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8080
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
8181
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8282
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8383
84-
apt install --reinstall -y \
84+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8585
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8686
8787
- name: Show OpenSSL version

‎.github/workflows/iperf.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7272
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7373
74-
apt install --reinstall -y \
74+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7575
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7676
77-
apt install --reinstall -y \
77+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7878
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
7979
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8080
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8181
82-
apt install --reinstall -y \
82+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8383
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8484
8585
- name: Verify wolfProvider is properly installed

‎.github/workflows/ipmitool.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
7272
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
7373
74-
apt install --reinstall -y \
74+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7575
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
7676
77-
apt install --reinstall -y \
77+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
7878
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
7979
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
8080
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
8181
82-
apt install --reinstall -y \
82+
apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
8383
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8484
8585
- name: Verify wolfProvider is properly installed

0 commit comments

Comments
 (0)