Upgrade generated CI to Ubuntu 24.04 (regen from ZProject).

Author: stephan57160

.github/workflows/CI.yaml

@@ -15,24 +15,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             BUILD_TYPE: default
             DRAFT: enabled
-            CLANG_FORMAT: clang-format-11
-            PACKAGES: automake autoconf clang-format-11 git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev asciidoc xmlto
-          - os: ubuntu-20.04
+            CLANG_FORMAT: clang-format-18
+            PACKAGES: automake autoconf clang-format-18 git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev asciidoc xmlto
+          - os: ubuntu-24.04
             BUILD_TYPE: default
             DRAFT: disabled
-            CLANG_FORMAT: clang-format-11
-            PACKAGES: automake autoconf clang-format-11 git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev
-          - os: ubuntu-20.04
+            CLANG_FORMAT: clang-format-18
+            PACKAGES: automake autoconf clang-format-18 git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev
+          - os: ubuntu-24.04
             BUILD_TYPE: valgrind
             DRAFT: enabled
-            PACKAGES: automake autoconf valgrind git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev
-          - os: ubuntu-20.04
+            PACKAGES: automake autoconf valgrind git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev
+          - os: ubuntu-24.04
             BUILD_TYPE: cmake
             DRAFT: enabled
-            PACKAGES: cmake git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev
+            PACKAGES: cmake git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev
           - os: macos-latest
             BUILD_TYPE: default
             PACKAGES: automake autoconf libtool  ossp-uuid zeromq curl libmicrohttpd
@@ -45,21 +45,21 @@ jobs:
 # to have dependencies ready and pass configure script before making this check).
 # Note that the autotools variant will also require dependencies preinstalled to
 # pass its configure script:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             BUILD_TYPE: cmake
             DO_CLANG_FORMAT_CHECK: 1
-            CLANG_FORMAT: clang-format-11
-            PACKAGES: cmake clang-format-11 git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev
+            CLANG_FORMAT: clang-format-18
+            PACKAGES: cmake clang-format-18 git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev
 # Note: the ABI compliance checker script currently assumes that:
 # 1) Your project sources have a "latest_release" branch or tag
 #    to check out and compare the current commit's ABI to;
 # 2) Prerequisites are available as packages - no custom rebuilds.
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             BUILD_TYPE: abi-compliance-checker
-            PACKAGES: universal-ctags abi-dumper abi-compliance-checker git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev
-          - os: ubuntu-20.04
+            PACKAGES: universal-ctags abi-dumper abi-compliance-checker git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev
+          - os: ubuntu-24.04
             BUILD_TYPE: check_zproject
-            PACKAGES: git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-nss-dev libmicrohttpd-dev generator-scripting-language zproject
+            PACKAGES: git uuid-dev libsystemd-dev liblz4-dev libnss3-dev libzmq3-dev libcurl4-gnutls-dev libmicrohttpd-dev generator-scripting-language zproject
     env:
 # Set CI_TIME: true to enable build-step profiling
 # Set CI_TRACE: true to enable shell script tracing
@@ -82,12 +82,12 @@ jobs:
       CI_SELFTEST: ${{ matrix.CI_SELFTEST }}
     steps:
     - name: Add debian packages
-      if: matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-24.04'
       uses: myci-actions/add-deb-repo@10
       with:
         repo-name: obs
-        repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/ ./
-        keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/Release.key
+        repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_24.04/ ./
+        keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_24.04/Release.key
         install: ${{ matrix.PACKAGES }}
     - name: Add brew packages
       if: matrix.os == 'macos-latest'
@@ -97,7 +97,7 @@ jobs:
       with:
         path: czmq
     - name: build
-      if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
+      if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-latest'
       shell: bash
       working-directory: czmq
       run: ./ci_build.sh

configure.ac

@@ -947,9 +947,6 @@ AC_ARG_ENABLE([zmakecert],
 AM_CONDITIONAL([ENABLE_ZMAKECERT], [test x$enable_zmakecert != xno])
 AM_COND_IF([ENABLE_ZMAKECERT], [AC_MSG_NOTICE([ENABLE_ZMAKECERT defined])])
 
-AM_CONDITIONAL([ENABLE_CZMQ_SELFTEST], [test x$enable_czmq_selftest != xno])
-AM_COND_IF([ENABLE_CZMQ_SELFTEST], [AC_MSG_NOTICE([ENABLE_CZMQ_SELFTEST defined])])
-
 # Check for zsp intent
 AC_ARG_ENABLE([zsp],
     AS_HELP_STRING([--enable-zsp],
@@ -960,9 +957,6 @@ AC_ARG_ENABLE([zsp],
 AM_CONDITIONAL([ENABLE_ZSP], [test x$enable_zsp != xno])
 AM_COND_IF([ENABLE_ZSP], [AC_MSG_NOTICE([ENABLE_ZSP defined])])
 
-AM_CONDITIONAL([ENABLE_CZMQ_SELFTEST], [test x$enable_czmq_selftest != xno])
-AM_COND_IF([ENABLE_CZMQ_SELFTEST], [AC_MSG_NOTICE([ENABLE_CZMQ_SELFTEST defined])])
-
 # Check for test_randof intent
 AC_ARG_ENABLE([test_randof],
     AS_HELP_STRING([--enable-test_randof],
@@ -973,9 +967,6 @@ AC_ARG_ENABLE([test_randof],
 AM_CONDITIONAL([ENABLE_TEST_RANDOF], [test x$enable_test_randof != xno])
 AM_COND_IF([ENABLE_TEST_RANDOF], [AC_MSG_NOTICE([ENABLE_TEST_RANDOF defined])])
 
-AM_CONDITIONAL([ENABLE_CZMQ_SELFTEST], [test x$enable_czmq_selftest != xno])
-AM_COND_IF([ENABLE_CZMQ_SELFTEST], [AC_MSG_NOTICE([ENABLE_CZMQ_SELFTEST defined])])
-
 # Check for czmq_selftest intent
 AC_ARG_ENABLE([czmq_selftest],
     AS_HELP_STRING([--enable-czmq_selftest],
@@ -986,9 +977,6 @@ AC_ARG_ENABLE([czmq_selftest],
 AM_CONDITIONAL([ENABLE_CZMQ_SELFTEST], [test x$enable_czmq_selftest != xno])
 AM_COND_IF([ENABLE_CZMQ_SELFTEST], [AC_MSG_NOTICE([ENABLE_CZMQ_SELFTEST defined])])
 
-AM_CONDITIONAL([ENABLE_CZMQ_SELFTEST], [test x$enable_czmq_selftest != xno])
-AM_COND_IF([ENABLE_CZMQ_SELFTEST], [AC_MSG_NOTICE([ENABLE_CZMQ_SELFTEST defined])])
-
 # Checks for library functions.
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset getifaddrs)