]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CI: github: remove OpenTracing leftovers
authorWilly Tarreau <w@1wt.eu>
Fri, 26 Jun 2026 14:45:38 +0000 (16:45 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 26 Jun 2026 14:45:38 +0000 (16:45 +0200)
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
.github/workflows/vtest.yml

index 2d1dfe241d30165f97ea97e894d5c2aaec0b42cf..cc1fcb01114a6655f420d7f042ca04acc22f2a7d 100755 (executable)
@@ -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",
index 5129cae3cddab9d06d4a8715fda18f7d4595ffac..fd546d5a7d885f561c76ccfefeecf2440ecc17cf 100644 (file)
@@ -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