CI: github: fix vtest path to allow correct caching

The vtest binary does not seem to be cached correctly by actions/cache,
the cause of the problem seems to be the binary is installed outside the
github workspace. This patch installs the binary in ~/vtest/ to fix the
issue.

diff --git a/.github/actions/setup-vtest/action.yml b/.github/actions/setup-vtest/action.yml
index 0730727bf8ddb30e77c9a4e9965c9e18c2ac4575..c487ba504c0b4e54e03dcd20fb08e3861c3ef620 100644 (file)
--- a/.github/actions/setup-vtest/action.yml
+++ b/.github/actions/setup-vtest/action.yml
@@ -30,14 +30,14 @@ runs:
       id: cache-vtest
       uses: actions/cache@v5
       with:
-        path: ${{ github.workspace }}/../vtest
+        path: ${{ github.workspace }}/vtest
         key: vtest-${{ runner.os }}-${{ steps.vtest-sha.outputs.sha }}
 
     - name: Install VTest
       if: steps.cache-vtest.outputs.cache-hit != 'true'
       shell: bash
       run: |
-        scripts/build-vtest.sh
+        DESTDIR=${{ github.workspace }}/vtest scripts/build-vtest.sh
 
     - name: Install problem matcher for VTest
       shell: bash

diff --git a/.github/workflows/aws-lc-template.yml b/.github/workflows/aws-lc-template.yml
index 8b4b9f5a7ef28c576c6385d6887279b007f3ea11..2cdeb6c73a94712732ada316928a357527b561bc 100644 (file)
--- a/.github/workflows/aws-lc-template.yml
+++ b/.github/workflows/aws-lc-template.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run VTest for HAProxy
         id: vtest
         run: |
-          make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+          make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
       - name: Run Unit tests
         id: unittests
         run: |

diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml
index 691ae453bb81605ef8d63417a641092aefbded42..f47c027e747265c8490ba2b24b1d3b52c9aa155b 100644 (file)
--- a/.github/workflows/fedora-rawhide.yml
+++ b/.github/workflows/fedora-rawhide.yml
@@ -59,7 +59,7 @@ jobs:
     - name: Run VTest for HAProxy ${{ steps.show-version.outputs.version }}
       id: vtest
       run: |
-        make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+        make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
     - name: Show VTest results
       if: ${{ failure() && steps.vtest.outcome == 'failure' }}
       run: |

diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml
index 54906b51a31e3a6042d7a6b7ba34c50a049a4002..2dc120696407f351016dd286e2f4bd3ca4b3bba8 100644 (file)
--- a/.github/workflows/musl.yml
+++ b/.github/workflows/musl.yml
@@ -24,7 +24,7 @@ jobs:
       - 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: scripts/build-vtest.sh
+        run: DESTDIR=${{ github.workspace }}/vtest scripts/build-vtest.sh
       - 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
@@ -36,7 +36,7 @@ jobs:
         run: echo "::add-matcher::.github/vtest.json"
       - name: Run VTest
         id: vtest
-        run: make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+        run: make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
       - name: Run Unit tests
         id: unittests
         run: |

diff --git a/.github/workflows/openssl-ech.yml b/.github/workflows/openssl-ech.yml
index 04cdac71750989a08fc37eae9ec859461c838ef4..6da7f1763e1d52613d45e105606f6982fec8066f 100644 (file)
--- a/.github/workflows/openssl-ech.yml
+++ b/.github/workflows/openssl-ech.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v5
       - name: Install VTest
         run: |
-          scripts/build-vtest.sh
+          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
@@ -51,7 +51,7 @@ jobs:
           ulimit -n 65536
           # allow to catch coredumps
           ulimit -c unlimited
-          make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+          make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
       - name: Show VTest results
         if: ${{ failure() && steps.vtest.outcome == 'failure' }}
         run: |

diff --git a/.github/workflows/openssl-master.yml b/.github/workflows/openssl-master.yml
index 85b351cf3ed10cfe06852861978bf1cc41497413..e3a76f1771e7e6a362a45286afbc883e6787dd82 100644 (file)
--- a/.github/workflows/openssl-master.yml
+++ b/.github/workflows/openssl-master.yml
@@ -46,7 +46,7 @@ jobs:
           ulimit -n 65536
           # allow to catch coredumps
           ulimit -c unlimited
-          make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+          make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
       - name: Show VTest results
         if: ${{ failure() && steps.vtest.outcome == 'failure' }}
         run: |

diff --git a/.github/workflows/quictls.yml b/.github/workflows/quictls.yml
index 5cedbae19c533002f27c89180c09ccca9b67c854..538d6e487d6e66c6f8eeac005ada4eb20632f67b 100644 (file)
--- a/.github/workflows/quictls.yml
+++ b/.github/workflows/quictls.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Run VTest for HAProxy
         id: vtest
         run: |
-          make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+          make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
       - name: Show VTest results
         if: ${{ failure() && steps.vtest.outcome == 'failure' }}
         run: |

diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml
index c748cdb6d76d360b6dc6a35de07b48e2499e9173..c9da72a4a1b4ad380bb5a9e407aa8f0e641e071a 100644 (file)
--- a/.github/workflows/vtest.yml
+++ b/.github/workflows/vtest.yml
@@ -140,7 +140,7 @@ jobs:
     - name: Run VTest for HAProxy ${{ steps.show-version.outputs.version }}
       id: vtest
       run: |
-        make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+        make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
     - name: Show VTest results
       if: ${{ failure() && steps.vtest.outcome == 'failure' }}
       run: |

diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml
index d99e084ab8337c4a0f2a416b1fa46add0623cac8..1ed41ac9bf05c210609ae517c08a430a04dd6deb 100644 (file)
--- a/.github/workflows/wolfssl.yml
+++ b/.github/workflows/wolfssl.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Run VTest for HAProxy
         id: vtest
         run: |
-          make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
+          make reg-tests VTEST_PROGRAM=${{ github.workspace }}/vtest/vtest REGTESTS_TYPES=default,bug,devel
       - name: Run Unit tests
         id: unittests
         run: |