]> git.kaiwu.me - haproxy.git/commitdiff
CI: github: use haproxytech/VTest2 for regression tests
authorWilliam Lallemand <wlallemand@haproxy.com>
Wed, 18 Nov 2026 14:42:38 +0000 (14:42 +0000)
committerWilliam Lallemand <wlallemand@haproxy.com>
Wed, 18 Nov 2026 14:46:27 +0000 (15:46 +0100)
The official VTest2 repository frequently causes CI failures. Use the
haproxytech/VTest2 repository instead.

Point the shared VTest setup action and the FreeBSD workflow at the
haproxytech/VTest2 repository for both cache SHA lookups and builds.
Select the build source through VTEST_URL, leaving the script default
unchanged.

This could be backported together with the previous commit,
691e22fbbd ("SCRIPTS: vtest: allow overriding the Git repository URL").

.github/actions/setup-vtest/action.yml
.github/workflows/freebsd.yml

index e2857296c5a1b00693b2c64029648bf9366459d1..5212c30f7b9d3db9ac2ccce404bc2e7ece30d03f 100644 (file)
@@ -32,7 +32,7 @@ runs:
       id: vtest-sha
       shell: sh
       run: |
-        echo "sha=$(git ls-remote https://code.vinyl-cache.org/vtest/VTest2 HEAD | cut -f1)" >> $GITHUB_OUTPUT
+        echo "sha=$(git ls-remote https://github.com/haproxytech/VTest2 HEAD | cut -f1)" >> $GITHUB_OUTPUT
 
     - name: Restore VTest cache
       id: cache-vtest
@@ -46,7 +46,7 @@ runs:
       shell: sh
       run: |
         # Use the runtime workspace, not the host-side github.workspace path.
-        DESTDIR="$GITHUB_WORKSPACE/vtest" scripts/build-vtest.sh
+        VTEST_URL=https://github.com/haproxytech/VTest2 DESTDIR="$GITHUB_WORKSPACE/vtest" scripts/build-vtest.sh
 
     - name: Save VTest cache
       if: ${{ steps.cache-vtest.outputs.cache-hit != 'true' }}
index 3099ceb0077a77ab8e3e279a7050891f99f6bb58..93807200ee217b973a19f6b1b5958c17118c812a 100644 (file)
@@ -22,7 +22,7 @@ jobs:
         id: vtest-sha
         shell: sh
         run: |
-          sha=$(git ls-remote https://code.vinyl-cache.org/vtest/VTest2 HEAD | cut -f1)
+          sha=$(git ls-remote https://github.com/haproxytech/VTest2 HEAD | cut -f1)
           if [ -n "${sha}" ]; then
             echo "sha=${sha}" >> "$GITHUB_OUTPUT"
           fi
@@ -47,7 +47,7 @@ jobs:
             sysctl kern.corefile=/tmp/%N.%P.core
             sysctl kern.sugid_coredump=1
             if ! "${GITHUB_WORKSPACE}/vtest/vtest" -V >/dev/null 2>&1; then
-              DESTDIR="${GITHUB_WORKSPACE}/vtest" scripts/build-vtest.sh
+              VTEST_URL=https://github.com/haproxytech/VTest2 DESTDIR="${GITHUB_WORKSPACE}/vtest" scripts/build-vtest.sh
             fi
             "${GITHUB_WORKSPACE}/vtest/vtest" -V
             gmake CC=clang V=1 ERR=1 TARGET=freebsd USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_OPENSSL=1 USE_LUA=1 LUA_INC=/usr/local/include/lua54 LUA_LIB=/usr/local/lib LUA_LIB_NAME=lua-5.4