CI: Consistently set up VTest with `./.github/actions/setup-vtest`

Two jobs still used `scripts/build-vtest.sh` directly, which seems like an
oversight.

diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml
index 60f1e93448527768f282a925a5c96d5ff7d69fd9..ce6f31e4018b2964455695bb9ef85a35d8b3bf94 100644 (file)
--- a/.github/workflows/musl.yml
+++ b/.github/workflows/musl.yml
@@ -23,8 +23,7 @@ jobs:
       - uses: actions/checkout@v6
       - name: Install dependencies
         run: apk add gcc gdb make tar git python3 libc-dev linux-headers pcre-dev pcre2-dev openssl-dev lua5.3-dev grep socat curl musl-dbg lua5.3-dbg jose
-      - name: Install VTest
-        run: DESTDIR=${{ github.workspace }}/vtest scripts/build-vtest.sh
+      - uses: ./.github/actions/setup-vtest
       - name: Build
         run: make -j$(nproc) TARGET=linux-musl DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" ARCH_FLAGS='-ggdb3' CC=cc V=1 USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PROMEX=1
       - name: Show version

diff --git a/.github/workflows/openssl-ech.yml b/.github/workflows/openssl-ech.yml
index 90411fa0397a6a9b013ed81ba0cd63cd6194123c..0ee3a227397642be5408c99974e6dc0ff8921317 100644 (file)
--- a/.github/workflows/openssl-ech.yml
+++ b/.github/workflows/openssl-ech.yml
@@ -14,14 +14,12 @@ jobs:
     if: ${{ github.repository_owner == 'haproxy' || github.event_name == 'workflow_dispatch' }}
     steps:
       - uses: actions/checkout@v6
-      - name: Install VTest
-        run: |
-          DESTDIR=${{ github.workspace }}/vtest scripts/build-vtest.sh
       - name: Install apt dependencies
         run: |
           sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
           sudo apt-get --no-install-recommends -y install socat gdb
           sudo apt-get --no-install-recommends -y install libpsl-dev
+      - uses: ./.github/actions/setup-vtest
       - name: Install OpenSSL+ECH
         run: env OPENSSL_VERSION="git-feature/ech" GIT_TYPE="branch" scripts/build-ssl.sh
       - name: Install curl+ECH