Skip to content

Commit 183ffea

Browse files
authored
Update dependencies and adjust build configurations
Updated WOLFSSL_VERSION and BORINGSSL_VERSION to latest versions. Adjusted timeout settings and modified build configurations for Slackware and tests.
1 parent fbfd5d9 commit 183ffea

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

.github/workflows/linux.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ env:
4040
# renovate: datasource=github-tags depName=libressl/portable versioning=semver registryUrl=https://github.com
4141
LIBRESSL_VERSION: 4.2.1
4242
# renovate: datasource=github-tags depName=wolfSSL/wolfssl versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
43-
WOLFSSL_VERSION: 5.8.2
43+
WOLFSSL_VERSION: 5.8.4
4444
# renovate: datasource=github-tags depName=Mbed-TLS/mbedtls versioning=semver registryUrl=https://github.com
4545
MBEDTLS_VERSION: 4.0.0
4646
# renovate: datasource=github-tags depName=Mbed-TLS/mbedtls versioning=semver:^3.0.0 registryUrl=https://github.com
4747
MBEDTLS_VERSION_PREV: 3.6.4
4848
# renovate: datasource=github-tags depName=awslabs/aws-lc versioning=semver registryUrl=https://github.com
4949
AWSLC_VERSION: 1.63.0
5050
# renovate: datasource=github-tags depName=google/boringssl versioning=semver registryUrl=https://github.com
51-
BORINGSSL_VERSION: 0.20251002.0
51+
BORINGSSL_VERSION: 0.20251124.0
5252
# handled in renovate.json
5353
OPENSSL_VERSION: 3.6.0
5454
# renovate: datasource=github-tags depName=rustls/rustls-ffi versioning=semver registryUrl=https://github.com
@@ -65,7 +65,7 @@ jobs:
6565
name: ${{ matrix.build.generate && 'CM' || 'AM' }} ${{ matrix.build.name }}
6666
runs-on: ${{ matrix.build.image || 'ubuntu-latest' }}
6767
container: ${{ matrix.build.container }}
68-
timeout-minutes: 45
68+
timeout-minutes: 25
6969
env:
7070
MATRIX_BUILD: ${{ matrix.build.generate && 'cmake' || 'autotools' }}
7171
MATRIX_INSTALL_PACKAGES: '${{ matrix.build.install_packages }}'
@@ -329,10 +329,10 @@ jobs:
329329
install_steps: intel
330330
configure: CC=icc --enable-debug --with-openssl
331331

332-
- name: 'Slackware openssl gssapi gcc'
333-
# These are essentially the same flags used to build the curl Slackware package
332+
- name: 'Slackware !ssl gssapi gcc'
333+
# Flags used to build the curl Slackware package, except OpenSSL 1.1.0:
334334
# https://ftpmirror.infania.net/slackware/slackware64-current/source/n/curl/curl.SlackBuild
335-
configure: --enable-debug --with-openssl --with-libssh2 --with-gssapi --enable-ares --enable-static=no --without-ca-bundle --with-ca-path=/etc/ssl/certs
335+
configure: --enable-debug --without-ssl --with-libssh2 --with-gssapi --enable-ares --enable-static=no --without-ca-bundle --with-ca-path=/etc/ssl/certs
336336
# Docker Hub image that `container-job` executes in
337337
container: 'andy5995/slackware-build-essential:15.0'
338338

@@ -439,6 +439,7 @@ jobs:
439439
cmake --install .
440440
441441
- name: 'cache nghttp2 (filc)'
442+
if: ${{ contains(matrix.build.install_steps, 'nghttp2-filc') }}
442443
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
443444
id: cache-nghttp2-filc
444445
env:
@@ -579,7 +580,7 @@ jobs:
579580
- name: 'build openssl (thread sanitizer)'
580581
if: ${{ contains(matrix.build.install_steps, 'openssl-tsan') && steps.cache-openssl-tsan.outputs.cache-hit != 'true' }}
581582
run: |
582-
git clone --quiet --depth=1 -b "openssl-${OPENSSL_VERSION}" https://github.com/openssl/openssl
583+
git clone --quiet --depth 1 -b "openssl-${OPENSSL_VERSION}" https://github.com/openssl/openssl
583584
cd openssl
584585
CC=clang CFLAGS='-fsanitize=thread' LDFLAGS='-fsanitize=thread' ./config --prefix=/home/runner/openssl --libdir=lib no-makedepend no-apps no-docs no-tests
585586
make
@@ -646,7 +647,7 @@ jobs:
646647
rm ~/rustls/librustls.zip
647648
648649
- name: 'build rustls'
649-
# Note: we don't check cache-hit here. If the cache is hit, we still need to dpkg install the deb.
650+
# Note: we do not check cache-hit here. If the cache is hit, we need to dpkg install the deb.
650651
if: ${{ contains(matrix.build.install_steps, 'rustls') }}
651652
run: sudo dpkg -i ~/rustls/"librustls_${RUSTLS_VERSION}_amd64.deb"
652653

@@ -661,7 +662,7 @@ jobs:
661662
source /opt/intel/oneapi/setvars.sh
662663
printenv >> "$GITHUB_ENV"
663664
664-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
665+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
665666
with:
666667
persist-credentials: false
667668

@@ -758,7 +759,7 @@ jobs:
758759
759760
- name: 'run tests'
760761
if: ${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') }}
761-
timeout-minutes: ${{ contains(matrix.build.install_packages, 'valgrind') && 30 || 15 }}
762+
timeout-minutes: ${{ contains(matrix.build.install_packages, 'valgrind') && 20 || 10 }}
762763
env:
763764
TEST_TARGET: ${{ matrix.build.torture && 'test-torture' || 'test-ci' }}
764765
TFLAGS: '${{ matrix.build.tflags }}'
@@ -769,6 +770,8 @@ jobs:
769770
if [[ "${MATRIX_INSTALL_PACKAGES}" = *'libgss-dev'* ]]; then
770771
TFLAGS+=' ~2077 ~2078' # memory leaks from Curl_auth_decode_spnego_message() -> gss_init_sec_context()
771772
fi
773+
elif [ "${TEST_TARGET}" != 'test-ci' ]; then
774+
TFLAGS+=' --buildinfo' # only test-ci sets this by default, set it manually for test-torture
772775
fi
773776
[ -f ~/venv/bin/activate ] && source ~/venv/bin/activate
774777
if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test'* ]]; then

0 commit comments

Comments
 (0)