From 1951db34ca0b2f27a9e462c32b4b2e317a327a06 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 19 Jul 2025 11:48:34 +0200 Subject: [PATCH] simplify torture tag --- .github/workflows/macos.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ec60f619d7..c714592aa6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -312,14 +312,14 @@ jobs: generate: -DENABLE_DEBUG=ON -DCURL_USE_RUSTLS=ON -DUSE_ECH=ON -DCURL_DISABLE_LDAP=ON -DUSE_SSLS_EXPORT=ON - name: 'OpenSSL torture !FTP' compiler: clang + install_steps: torture generate: -DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_THREADED_RESOLVER=OFF -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl tflags: -t --shallow=25 !FTP - torture: true - name: 'OpenSSL torture FTP' compiler: clang + install_steps: torture generate: -DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_THREADED_RESOLVER=OFF -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl tflags: -t --shallow=20 FTP - torture: true exclude: # opt out jobs from combinations that have the compiler set manually - { compiler: llvm@18, build: { compiler: 'clang' } } @@ -469,9 +469,9 @@ jobs: - name: 'run tests' if: ${{ !contains(matrix.build.install_steps, 'clang-tidy') }} - timeout-minutes: ${{ matrix.build.torture && 20 || 10 }} + timeout-minutes: ${{ contains(matrix.build.install_steps, 'torture') && 20 || 10 }} env: - TEST_TARGET: ${{ matrix.build.torture && 'test-torture' || 'test-ci' }} + TEST_TARGET: ${{ contains(matrix.build.install_steps, 'torture') && 'test-torture' || 'test-ci' }} TFLAGS: '${{ matrix.build.tflags }}' run: | TFLAGS="-j20 ${TFLAGS}"