From 78639c7cf7c4f9259117c193d403b9f66bdf92a4 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 26 Jun 2026 16:45:38 +0200 Subject: [PATCH] CI: github: remove OpenTracing leftovers When removing support for USE_OT=1 I only saw the tests but not the build matrix, and this now causes build failures on the CI for tests with "all features". Let's remove it there as well as the checks for the OT cache and libs. --- .github/matrix.py | 2 -- .github/workflows/vtest.yml | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/.github/matrix.py b/.github/matrix.py index 2d1dfe241..cc1fcb011 100755 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -172,7 +172,6 @@ def main(ref_name): "FLAGS": [ 'DEBUG="-DDEBUG_LIST"', "USE_ZLIB=1", - "USE_OT=1", "OT_INC=${HOME}/opt-ot/include", "OT_LIB=${HOME}/opt-ot/lib", "OT_RUNPATH=1", @@ -206,7 +205,6 @@ def main(ref_name): 'ARCH_FLAGS="-g -fsanitize=address"', 'OPT_CFLAGS="-O1"', "USE_ZLIB=1", - "USE_OT=1", "DEBUG=-DDEBUG_STRICT=2", "OT_INC=${HOME}/opt-ot/include", "OT_LIB=${HOME}/opt-ot/lib", diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml index 5129cae3c..fd546d5a7 100644 --- a/.github/workflows/vtest.yml +++ b/.github/workflows/vtest.yml @@ -65,13 +65,6 @@ jobs: path: '~/opt/' key: ssl-${{ steps.generate-cache-key.outputs.key }} - - name: Cache OpenTracing - if: ${{ contains(matrix.FLAGS, 'USE_OT=1') }} - id: cache_ot - uses: actions/cache@v5 - with: - path: '~/opt-ot/' - key: ${{ matrix.os }}-ot-${{ matrix.CC }}-${{ env.OT_CPP_VERSION }}-${{ contains(matrix.name, 'ASAN') }} - name: Add i386 architecture if: ${{ matrix.CC == 'i686-linux-gnu-gcc' }} run: sudo dpkg --add-architecture i386 @@ -99,10 +92,6 @@ jobs: - name: Install SSL ${{ matrix.ssl }} if: ${{ matrix.ssl && matrix.ssl != 'stock' && steps.cache_ssl.outputs.cache-hit != 'true' }} run: env ${{ matrix.ssl }} scripts/build-ssl.sh - - name: Install OpenTracing libs - if: ${{ contains(matrix.FLAGS, 'USE_OT=1') && steps.cache_ot.outputs.cache-hit != 'true' }} - run: | - OT_PREFIX=${HOME}/opt-ot scripts/build-ot.sh - name: Build WURFL if: ${{ contains(matrix.FLAGS, 'USE_WURFL=1') }} run: make -C addons/wurfl/dummy -- 2.47.3