]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
CI: move no-verbose build from Circle CI to existing GHA jobs, with tests
authorViktor Szakats <commit@vsz.me>
Wed, 1 Oct 2025 20:07:37 +0000 (22:07 +0200)
committerViktor Szakats <commit@vsz.me>
Thu, 2 Oct 2025 12:58:06 +0000 (14:58 +0200)
To test it in GHA and catch issues at PR time. Before this patch,
Circle CI caught them after pushing to master (or non-fork PR
branches.) GHA also run runtests, pytests and static analysis on
these builds, after this patch.

- GHA/linux: enable no-verbose in an existing job.
- GHA/linux: enable no-verbose in the H3 scan-build job too.
- GHA/macos: enable no-verbose in one build (= 3 jobs with different
  compilers).
- GHA/codeql: enable no-verbose in the MultiSSL Linux build.
- circleci: delete openssl no-verbose job in favor of the above.

Closes #18797

.circleci/config.yml
.github/workflows/codeql.yml
.github/workflows/linux.yml
.github/workflows/macos.yml

index 39201708e81bfbe0ef555b5a2212969faf64e00d..63eae308c49fc1f0975fed760cb1a75f98e3eadc 100644 (file)
@@ -70,15 +70,6 @@ commands:
               --with-openssl \
               || { tail -1000 config.log; false; }
 
-  configure-openssl-no-verbose:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror \
-              --with-openssl --disable-verbose \
-              || { tail -1000 config.log; false; }
-
   configure-no-proxy:
     steps:
       - run:
@@ -139,14 +130,6 @@ jobs:
       - build
       - test
 
-  no-verbose:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - configure-openssl-no-verbose
-      - build
-
   no-proxy:
     executor: ubuntu
     steps:
@@ -216,10 +199,6 @@ workflows:
     jobs:
       - no-proxy
 
-  openssl-no-verbose:
-    jobs:
-      - no-verbose
-
   arm-openssl:
     jobs:
       - arm
index 53505673a473c511d7778ebde21f37dbf4ce584b..fe33518d8b16c0cd8c8ff1aa20c0fe72aee9cc04 100644 (file)
@@ -107,7 +107,8 @@ jobs:
             export PKG_CONFIG_PATH; PKG_CONFIG_PATH="$(brew --prefix c-ares)/lib/pkgconfig:$(brew --prefix mbedtls)/lib/pkgconfig:$(brew --prefix rustls-ffi)/lib/pkgconfig:$(brew --prefix gsasl)/lib/pkgconfig"
             cmake -B _bld1 -G Ninja -DENABLE_DEBUG=ON \
               -DCURL_USE_GNUTLS=ON -DCURL_USE_MBEDTLS=ON -DCURL_USE_RUSTLS=ON -DCURL_USE_WOLFSSL=ON \
-              -DUSE_LIBRTMP=ON -DCURL_USE_GSASL=ON -DCURL_USE_GSSAPI=ON -DUSE_SSLS_EXPORT=ON -DUSE_ECH=ON -DENABLE_ARES=ON
+              -DUSE_LIBRTMP=ON -DCURL_USE_GSASL=ON -DCURL_USE_GSSAPI=ON -DUSE_SSLS_EXPORT=ON -DUSE_ECH=ON -DENABLE_ARES=ON \
+              -DCURL_DISABLE_VERBOSE_STRINGS=ON
             cmake --build _bld1
             cmake --build _bld1 --target curlinfo
             cmake --build _bld1 --target servers
index 3c827ae34b1c7d0769f2dfb72173c25cd5e83247..3cdb9a47cd609dcc8ec6e10ea4850f40074ec38e 100644 (file)
@@ -156,7 +156,7 @@ jobs:
 
           - name: 'openssl arm'
             install_steps: pytest
-            configure: CFLAGS=-std=gnu89 --with-openssl --enable-debug
+            configure: CFLAGS=-std=gnu89 --with-openssl --enable-debug --disable-verbose
             image: 'ubuntu-24.04-arm'
 
           - name: 'openssl -O3 libssh valgrind'
@@ -252,6 +252,7 @@ jobs:
               --with-openssl=/home/linuxbrew/.linuxbrew/opt/openssl --with-ngtcp2 --with-nghttp3=
               --with-libidn2 --enable-httpsrr --enable-ares
               --disable-debug --disable-unity
+              --disable-verbose
 
           - name: 'address-sanitizer'
             install_packages: clang libssl-dev libssh-dev libidn2-dev libnghttp2-dev libubsan1 libasan8 libtsan2
index b0f958d70c983952a25b5ff992e0d9df6b486900..a321d28b3358bbed2c36ed51eaef63242c6427ee 100644 (file)
@@ -277,7 +277,7 @@ jobs:
           # cmake
           - name: 'OpenSSL gsasl rtmp AppleIDN'
             install: libnghttp3 libngtcp2 gsasl rtmpdump
-            generate: -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DCURL_USE_GSASL=ON -DUSE_LIBRTMP=ON -DUSE_APPLE_IDN=ON -DUSE_NGTCP2=ON
+            generate: -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DCURL_USE_GSASL=ON -DUSE_LIBRTMP=ON -DUSE_APPLE_IDN=ON -DUSE_NGTCP2=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON
           - name: 'MultiSSL AppleIDN clang-tidy +examples'
             compiler: clang
             install: llvm brotli zstd gnutls nettle libressl krb5 mbedtls gsasl rustls-ffi rtmpdump libssh fish