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`.

diff --git a/.github/workflows/aws-lc-template.yml b/.github/workflows/aws-lc-template.yml
index 8c3c65a50a9cefe6174a40bf6aaed06841620ff5..43fe956035c56f40bac4604d60f2e8f51725b4ff 100644 (file)
--- 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 4af546c114dd3e5a8d0abe401cc1678979dccb76..e023a40a632e6cdc64286a6a685b3605c9c078c8 100644 (file)
--- 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 884108b1fcbdbb43b3d8a946ec58653a639c277b..8eb11137095e3cdce53ae72428494b758fcdefe3 100644 (file)
--- 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 23f8989eb9003de4290db7326c81b8d782553a35..90411fa0397a6a9b013ed81ba0cd63cd6194123c 100644 (file)
--- 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 84e47e4b57ec42ede7398ddb561f8e0ced18bbd8..ab9d1ca38096dbe181f3bcf24dc3c861ad4cac65 100644 (file)
--- 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 bf78bfb78fa522e3bee9e6daf96866b833065d51..b662b734727914ffc6a4555900c861a4237d5cf4 100644 (file)
--- 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 a7913c7b40645190d07c9b1e7df4a447b1eb8157..dec4735129f44f0665e73cdd5f76024f61fda87b 100644 (file)
--- 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 ae0cd7cdcd9afb3f7a0c55ca9a1077fd7a17bd7d..41982fa5a98bb795307003bc0855b338dac6eaea 100644 (file)
--- 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