GHA: sync up `curl -V` step descriptions

Also to make it easier to recognize.

Also:
- GHA/linux-old: split steps to match other jobs.
- GHA: add `--disable` where missing.

Closes #19084

diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml
index ae220eb3e8830c6f046bdf4c817e6a4c9bcb94ea..38d2fb6ac0258ba8dc8b0c36f7082d5934e9e4a1 100644 (file)
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -661,8 +661,8 @@ jobs:
             make -C bld V=1
           fi
 
-      - name: 'check curl -V output'
-        run: bld/src/curl -V
+      - name: 'curl -V'
+        run: bld/src/curl --disable -V
 
       - name: 'build tests'
         if: ${{ !contains(matrix.build.install_steps, 'skipall') }}

diff --git a/.github/workflows/linux-old.yml b/.github/workflows/linux-old.yml
index fde23de811c2f98e6a69cc775bffdb0d2dcb58d4..e145633708de9b1c42426da03fd3e106f4ea2d8f 100644 (file)
--- a/.github/workflows/linux-old.yml
+++ b/.github/workflows/linux-old.yml
@@ -80,14 +80,18 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: 'cmake build-only (out-of-tree)'
+      - name: 'cmake build-only configure (out-of-tree)'
         run: |
           mkdir bld-1
           cd bld-1
           cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
             -DCURL_USE_GNUTLS=ON -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON
-          VERBOSE=1 make install
-          src/curl --disable --version
+
+      - name: 'cmake build-only build'
+        run: VERBOSE=1 make -C bld-1 install
+
+      - name: 'cmake build-only curl -V'
+        run: bld-1/src/curl --disable --version
 
       - name: 'cmake build-only configure log'
         if: ${{ !cancelled() }}
@@ -118,9 +122,10 @@ jobs:
           grep -F '#define' bld-cares/lib/curl_config.h | sort || true
 
       - name: 'cmake build'
-        run: |
-          make -C bld-cares
-          bld-cares/src/curl --disable --version
+        run: make -C bld-cares
+
+      - name: 'cmake curl -V'
+        run: bld-cares/src/curl --disable --version
 
       - name: 'cmake install'
         run: make -C bld-cares install
@@ -135,7 +140,7 @@ jobs:
         run: make -C bld-cares curl-examples-build
 
       - name: 'autoreconf'
-        run: autoreconf -if
+        run: autoreconf -fi
 
       - name: 'autotools configure (out-of-tree, c-ares, zstd, gssapi)'
         run: |
@@ -155,9 +160,10 @@ jobs:
           grep -F '#define' bld-am/lib/curl_config.h | sort || true
 
       - name: 'autotools build'
-        run: |
-          make -C bld-am
-          bld-am/src/curl --disable --version
+        run: make -C bld-am
+
+      - name: 'autotools curl -V'
+        run: bld-am/src/curl --disable --version
 
       - name: 'autotools install'
         run: make -C bld-am install

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 71390502dc7049e1805730f093145b53889baafa..2d674dc195cff6b15c626ce54aa98520b8d0f317 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -638,9 +638,9 @@ jobs:
           fi
           ./scripts/singleuse.pl --unit "${libcurla}"
 
-      - name: 'check curl -V output'
+      - name: 'curl -V'
         if: ${{ matrix.build.make-custom-target != 'tidy' }}
-        run: bld/src/curl -V
+        run: bld/src/curl --disable -V
 
       - name: 'curl install'
         run: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2ac37381ea46a4590572416c17d1b16596b8fc9b..1e9f2408a8baa1cc0e9f37500d0555a2821aab7e 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -461,7 +461,7 @@ jobs:
             make -C bld V=1
           fi
 
-      - name: 'curl version'
+      - name: 'curl -V'
         run: bld/src/curl --disable --version
 
       - name: 'curl install'
@@ -705,5 +705,5 @@ jobs:
             make -C bld V=1
           fi
 
-      - name: 'curl version'
+      - name: 'curl -V'
         run: bld/src/curl --disable --version

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 28143fdc5a000d7b09ccbc1334180bdf07060ea5..975b592c7ce1229e5c5349baa2616f023e534b86 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -130,7 +130,7 @@ jobs:
             make -C bld V=1 install
           fi
 
-      - name: 'curl version'
+      - name: 'curl -V'
         timeout-minutes: 1
         run: |
           PATH=/usr/bin
@@ -332,7 +332,7 @@ jobs:
             make -C bld V=1 install
           fi
 
-      - name: 'curl version'
+      - name: 'curl -V'
         timeout-minutes: 1
         run: |
           if [ "${MATRIX_BUILD}" = 'cmake' ]; then
@@ -547,7 +547,7 @@ jobs:
           PATH="/d/my-cache/${MATRIX_DIR}/bin:$PATH"
           cmake --build bld
 
-      - name: 'curl version'
+      - name: 'curl -V'
         timeout-minutes: 1
         run: |
           /usr/bin/find . \( -name '*.exe' -o -name '*.dll' -o -name '*.a' \) -exec file '{}' \;
@@ -907,7 +907,7 @@ jobs:
         timeout-minutes: 5
         run: cmake --build bld --config "${MATRIX_TYPE}" --parallel 5
 
-      - name: 'curl version'
+      - name: 'curl -V'
         timeout-minutes: 1
         run: |
           /usr/bin/find . \( -name '*.exe' -o -name '*.dll' -o -name '*.lib' -o -name '*.pdb' \) -exec file '{}' \;