From 86430ab5a461dac5dbe46ebf1e839082eb5014b8 Mon Sep 17 00:00:00 2001 From: Tim Duesterhus Date: Sun, 12 Apr 2026 21:27:07 +0200 Subject: [PATCH] CI: Simplify version extraction with `haproxy -vq` Instead of running `awk` on the output of `haproxy -v` to extract the bare version number, we can use `haproxy -vq`. --- .github/workflows/aws-lc-template.yml | 2 +- .github/workflows/compliance.yml | 2 +- .github/workflows/fedora-rawhide.yml | 2 +- .github/workflows/openssl-ech.yml | 2 +- .github/workflows/openssl-master.yml | 2 +- .github/workflows/quictls.yml | 2 +- .github/workflows/vtest.yml | 2 +- .github/workflows/wolfssl.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/aws-lc-template.yml b/.github/workflows/aws-lc-template.yml index 8c3c65a50..43fe95603 100644 --- a/.github/workflows/aws-lc-template.yml +++ b/.github/workflows/aws-lc-template.yml @@ -48,7 +48,7 @@ jobs: run: | ldd $(which haproxy) haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - uses: ./.github/actions/setup-vtest - name: Run VTest for HAProxy id: vtest diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 4af546c11..e023a40a6 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -45,7 +45,7 @@ jobs: fi echo "::endgroup::" haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - name: Launch HAProxy ${{ steps.show-version.outputs.version }} run: haproxy -f .github/h2spec.config -D - name: Run h2spec ${{ steps.install-h2spec.outputs.version }} diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml index 884108b1f..8eb111370 100644 --- a/.github/workflows/fedora-rawhide.yml +++ b/.github/workflows/fedora-rawhide.yml @@ -48,7 +48,7 @@ jobs: ldd $(command -v haproxy) echo "::endgroup::" haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT # # TODO: review this workaround later - name: relax crypto policies diff --git a/.github/workflows/openssl-ech.yml b/.github/workflows/openssl-ech.yml index 23f8989eb..90411fa03 100644 --- a/.github/workflows/openssl-ech.yml +++ b/.github/workflows/openssl-ech.yml @@ -40,7 +40,7 @@ jobs: run: | ldd $(which haproxy) haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - name: Install problem matcher for VTest run: echo "::add-matcher::.github/vtest.json" - name: Run VTest for HAProxy diff --git a/.github/workflows/openssl-master.yml b/.github/workflows/openssl-master.yml index 84e47e4b5..ab9d1ca38 100644 --- a/.github/workflows/openssl-master.yml +++ b/.github/workflows/openssl-master.yml @@ -35,7 +35,7 @@ jobs: run: | ldd $(which haproxy) haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - name: Install problem matcher for VTest run: echo "::add-matcher::.github/vtest.json" - name: Run VTest for HAProxy diff --git a/.github/workflows/quictls.yml b/.github/workflows/quictls.yml index bf78bfb78..b662b7347 100644 --- a/.github/workflows/quictls.yml +++ b/.github/workflows/quictls.yml @@ -38,7 +38,7 @@ jobs: run: | ldd $(which haproxy) haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - uses: ./.github/actions/setup-vtest - name: Run VTest for HAProxy id: vtest diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml index a7913c7b4..dec473512 100644 --- a/.github/workflows/vtest.yml +++ b/.github/workflows/vtest.yml @@ -136,7 +136,7 @@ jobs: fi echo "::endgroup::" haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - name: Run VTest for HAProxy ${{ steps.show-version.outputs.version }} id: vtest run: | diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml index ae0cd7cdc..41982fa5a 100644 --- a/.github/workflows/wolfssl.yml +++ b/.github/workflows/wolfssl.yml @@ -34,7 +34,7 @@ jobs: run: | ldd $(which haproxy) haproxy -vv - echo "version=$(haproxy -v |awk 'NR==1{print $3}')" >> $GITHUB_OUTPUT + echo "version=$(haproxy -vq)" >> $GITHUB_OUTPUT - uses: ./.github/actions/setup-vtest - name: Run VTest for HAProxy id: vtest