try dumping -V info at the end of the builds

curl · Sep 1, 2024 · 3495902 · 3495902
1 parent b1f818f
commit 3495902
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -82,7 +82,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-glibc-debian-testing-llvm'
@@ -114,7 +114,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-glibc-debian-testing-gcc'
@@ -147,7 +147,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-glibc-debian-bookworm-llvm'
@@ -180,7 +180,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-glibc-debian-bookworm-gcc'
@@ -211,7 +211,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-debian-testing-llvm'
@@ -242,7 +242,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-debian-testing-gcc'
@@ -275,7 +275,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-debian-bookworm-llvm'
@@ -308,7 +308,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-debian-bookworm-gcc'
@@ -339,7 +339,7 @@ jobs:
             sh -c 'apk add --no-cache bash && ./_ci-linux-alpine.sh'
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-alpine-llvm-x86_64'
@@ -370,7 +370,7 @@ jobs:
             sh -c 'apk add --no-cache bash && ./_ci-linux-alpine.sh'
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-alpine-gcc-x86_64'
@@ -395,7 +395,7 @@ jobs:
           sh -c ./_ci-mac-homebrew.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-from-mac'
@@ -422,7 +422,7 @@ jobs:
           sh -c ./_ci-mac-homebrew.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-macos-universal-clang'
@@ -449,7 +449,7 @@ jobs:
           sh -c ./_ci-mac-homebrew.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-macos-universal-llvm'
@@ -477,7 +477,7 @@ jobs:
           sh -c ./_ci-mac-homebrew.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-macos-gcc-arm64'
@@ -506,7 +506,7 @@ jobs:
           sh -c ./_ci-mac-homebrew.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-windows-llvm-from-mac'
@@ -540,7 +540,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-windows-llvm'
@@ -574,7 +574,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-windows-gcc-noarm64'

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -46,7 +46,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-glibc-daily-tool'
@@ -85,7 +85,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-linux-musl-daily-tool'
@@ -118,7 +118,7 @@ jobs:
           sh -c ./_ci-mac-homebrew.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       - uses: actions/upload-artifact@v4
         with:
           name: 'curl-macos-universal-daily-tool'
@@ -159,7 +159,7 @@ jobs:
             sh -c ./_ci-linux-debian.sh
 
       - name: 'list dependencies'
-        run: cat urls.txt
+        run: cat urls.txt *-version-*.txt || true
       # https://github.com/actions/upload-artifact
       - uses: actions/upload-artifact@v4
         with:

diff --git a/curl.sh b/curl.sh
@@ -555,7 +555,7 @@ _VER="$1"
     # directly from the binary as strings, but curl creates most of these
     # strings dynamically at runtime, so this is not possible
     # (as of curl 7.83.1).
-    ${_RUN_BIN} "${bin}" --disable --version | tee "curl-${_CPU}.txt" || true
+    ${_RUN_BIN} "${bin}" --disable --version | sed 's/$/\x0d/' | tee "../curl-version-${_CPU}.txt" || true
   fi
 
   # Create package

diff --git a/trurl.sh b/trurl.sh
@@ -116,7 +116,7 @@ _VER="$1"
   # when running it from the unpacked release tarball.
   LD_LIBRARY_PATH="$(pwd)/../curl/${_PP}/lib" \
   DYLD_LIBRARY_PATH="$(pwd)/../curl/${_PP}/lib" \
-    ${_RUN_BIN} "${bin}" --version | tee "trurl-${_CPU}.txt" || true
+    ${_RUN_BIN} "${bin}" --version | sed 's/$/\x0d/' | tee "../trurl-version-${_CPU}.txt" || true
   unset LD_DEBUG
 
   if [ "${CW_TURL_TEST:-}" = '1' ] && \