Run wget-v1.21.4 and openldap-v2.6.7 on native ubuntu:24.04 instead of

gasbytes · gasbytes · commit 45546b4ec165 · 2025-11-17T17:04:13.000+01:00
debian:bookworm
diff --git a/.github/workflows/openldap.yml b/.github/workflows/openldap.yml
@@ -1,53 +1,65 @@
 name: OpenLDAP Test
-
 # START OF COMMON SECTION
 on:
   push:
     branches: [ 'master', 'main', 'release/**' ]
   pull_request:
     branches: [ '*' ]
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 # END OF COMMON SECTION
-
 jobs:
   build_gnutls:
     name: Build wolfSSL, GnuTLS and provider
     timeout-minutes: 30
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        openldap_ref: [ 'master', 'OPENLDAP_REL_ENG_2_5_13', 'OPENLDAP_REL_ENG_2_6_7', 'OPENLDAP_REL_ENG_2_6_9' ]
+        include:
+          - os: ubuntu-latest
+            openldap_ref: 'master'
+            use_container: true
+          - os: ubuntu-latest
+            openldap_ref: 'OPENLDAP_REL_ENG_2_5_13'
+            use_container: true
+          - os: ubuntu-24.04
+            openldap_ref: 'OPENLDAP_REL_ENG_2_6_7'
+            use_container: false
+          - os: ubuntu-latest
+            openldap_ref: 'OPENLDAP_REL_ENG_2_6_9'
+            use_container: true
       fail-fast: false
     runs-on: ${{ matrix.os }}
-    container:
-      image: debian:bookworm
-
+    container: ${{ matrix.use_container && 'debian:bookworm' || '' }}
     steps:
       - name: Checkout gnutls-wolfssl repository
         uses: actions/checkout@v4
-
-      - name: Ensure make available (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Ensure make available
+        if: matrix.use_container == true
         run: |
           apt-get update
           apt-get install -y build-essential
-
-      - name: Install GnuTLS dependencies (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Install GnuTLS dependencies
+        if: matrix.use_container == true
         run: |
           apt-get install -y gnulib autopoint gperf gtk-doc-tools nettle-dev clang \
             libtasn1-bin libtasn1-6-dev libunistring-dev libp11-kit-dev libunbound-dev sudo \
-            git wget
+            git wget automake libtool
 
-      - name: Install OpenLDAP dependencies (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Install OpenLDAP dependencies
+        if: matrix.use_container == true
         run: |
           sudo apt-get install -y libsasl2-dev libsasl2-modules libsasl2-modules-gssapi-mit \
             libargon2-dev groff-base libltdl-dev
 
+      - name: Install dependencies on native Ubuntu
+        if: matrix.use_container == false
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential gnulib autopoint gperf gtk-doc-tools nettle-dev clang \
+            libtasn1-bin libtasn1-6-dev libunistring-dev libp11-kit-dev libunbound-dev \
+            git wget libsasl2-dev libsasl2-modules libsasl2-modules-gssapi-mit \
+            libargon2-dev groff-base libltdl-dev automake libtool
       # ───────────── cache the wolfssl/gnutls tool-chain ─────────────
       - name: Restore cached gnutls-wolfssl
         id: cache-gnutls
@@ -60,27 +72,23 @@ jobs:
           key: gnutls-wolfssl-${{ runner.os }}-${{ hashFiles('setup.sh', 'wolfssl-gnutls-wrapper/**', 'wolfssl/**', 'gnutls/**') }}
           restore-keys: |
             gnutls-wolfssl-${{ runner.os }}-
-
       - name: Build GnuTLS with wolfSSL provider using setup.sh script
         if: steps.cache-gnutls.outputs.cache-hit != 'true'
         run: |
           echo "Running setup.sh..."
           GNUTLS_INSTALL=/opt/gnutls WOLFSSL_INSTALL=/opt/wolfssl ./setup.sh
-
       - name: Check setup.sh output directories
         run: |
           test -d /opt/wolfssl || { echo "/opt/wolfssl missing"; exit 1; }
           test -d /opt/gnutls || { echo "/opt/gnutls missing"; exit 1; }
           test -d /opt/wolfssl-gnutls-wrapper/lib || { echo "/opt/wolfssl-gnutls-wrapper/lib missing"; exit 1; }
-
       - name: Build OpenLDAP at ${{ matrix.openldap_ref }}
         run: |
           git clone https://git.openldap.org/openldap/openldap.git
           cd openldap
           if [ "${{ matrix.openldap_ref }}" != "master" ]; then
             git checkout ${{ matrix.openldap_ref }}
           fi
-
       - name: Configure OpenLDAP
         working-directory: openldap
         run: |
@@ -97,13 +105,11 @@ jobs:
             --enable-remoteauth \
             --prefix=/opt/openldap \
             --enable-modules
-
       - name: Build OpenLDAP
         working-directory: openldap
         run: |
           make depend
           make
-
       - name: Test OpenLDAP
         working-directory: openldap
         run: |
diff --git a/.github/workflows/wget.yml b/.github/workflows/wget.yml
@@ -18,35 +18,53 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        wget_ref: [ 'master', 'v1.21.3', 'v1.21.4', 'v1.24.5' ]
+        include:
+          - os: ubuntu-latest
+            wget_ref: 'master'
+            use_container: true
+          - os: ubuntu-latest
+            wget_ref: 'v1.21.3'
+            use_container: true
+          - os: ubuntu-24.04
+            wget_ref: 'v1.21.4'
+            use_container: false
+          - os: ubuntu-latest
+            wget_ref: 'v1.24.5'
+            use_container: true
       fail-fast: false
     runs-on: ${{ matrix.os }}
-    container:
-      image: debian:bookworm
+    container: ${{ matrix.use_container && 'debian:bookworm' || '' }}
 
     steps:
       - name: Checkout gnutls-wolfssl repository
         uses: actions/checkout@v4
 
-      - name: Ensure make available (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Ensure make available
+        if: matrix.use_container == true
         run: |
           apt-get update
           apt-get install -y build-essential
 
-      - name: Install GnuTLS dependencies (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Install GnuTLS dependencies
+        if: matrix.use_container == true
         run: |
           apt-get install -y gnulib autopoint gperf gtk-doc-tools nettle-dev clang \
             libtasn1-bin libtasn1-6-dev libunistring-dev libp11-kit-dev libunbound-dev \
             sudo wget git flex
 
-      - name: Install wget dependencies (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Install wget dependencies
+        if: matrix.use_container == true
         run: |
           sudo apt-get install -y autoconf-archive libhttp-daemon-perl
 
+      - name: Install dependencies on native Ubuntu
+        if: matrix.use_container == false
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential gnulib autopoint gperf gtk-doc-tools nettle-dev clang \
+            libtasn1-bin libtasn1-6-dev libunistring-dev libp11-kit-dev libunbound-dev \
+            wget git flex autoconf-archive libhttp-daemon-perl
+
       # ───────────── cache the wolfssl/gnutls tool-chain ─────────────
       - name: Restore cached gnutls-wolfssl
         id: cache-gnutls
@@ -102,7 +120,7 @@ jobs:
 
       # Get python 3.11 for old versions of wget
       - name: Install pyenv dependencies
-        if: matrix.wget_ref == 'v1.21.3'
+        if: matrix.wget_ref == 'v1.21.3' || matrix.wget_ref == 'v1.21.4'
         run: |
           sudo apt-get update
           sudo apt-get install -y make build-essential libssl-dev zlib1g-dev \
