From bd7b6fd25dae16700e474eead63c64cea6b686fb Mon Sep 17 00:00:00 2001
From: silverqx <silver.zachara@gmail.com>
Date: Fri, 9 Aug 2024 21:36:05 +0200
Subject: [PATCH] workflows bugfix print compiler/linker versions

---
 .github/workflows/clang-cl-qt6.yml         |  4 ++++
 .github/workflows/linux-qt6-drivers.yml    | 10 +++++++---
 .github/workflows/linux-qt6.yml            |  8 +++++---
 .github/workflows/msys2-ucrt64-drivers.yml |  7 ++++---
 .github/workflows/msys2-ucrt64.yml         |  7 ++++---
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml
index 60aa5f626..843cd2061 100644
--- a/.github/workflows/clang-cl-qt6.yml
+++ b/.github/workflows/clang-cl-qt6.yml
@@ -684,6 +684,10 @@ jobs:
       run: |
         & ${env:LLVM_PATH}\bin\clang-cl.exe --version
 
+    - name: Linker print version (lld-link.exe)
+      run: |
+        lld-link.exe --version
+
     - name: Compiler print version (cl.exe)
       run: |
         cl.exe
diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml
index 598e662b4..8e52089c6 100644
--- a/.github/workflows/linux-qt6-drivers.yml
+++ b/.github/workflows/linux-qt6-drivers.yml
@@ -61,10 +61,12 @@ jobs:
           - key: clang
             name: clang18
             command: clang++-18
+            linker-command: ld.lld
 
           - key: gcc
             name: gcc14
             command: g++-14
+            linker-command: ld
 
         include:
           - lto: ON
@@ -76,6 +78,7 @@ jobs:
               key: clang
               name: clang18
               command: clang++-18
+              linker-command: ld.lld
 
           - lto: ON
             drivers-type: Loadable
@@ -86,6 +89,7 @@ jobs:
               key: gcc
               name: gcc14
               command: g++-14
+              linker-command: ld
 
     steps:
     - uses: actions/checkout@v4
@@ -215,13 +219,13 @@ jobs:
         # it works but doesn't work using the GITHUB_PATH like define two line above. 🫤
         echo "CMAKE_PREFIX_PATH=/opt/Qt/$TINY_QT_VERSION/$TinyQtSpecPlain${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
 
-    - name: Compiler print version (${{ matrix.compiler.name }})
+    - name: Compiler print version (${{ matrix.compiler.command }})
       run: |
         ${{ matrix.compiler.command }} --version
 
-    - name: Linker print version (ld)
+    - name: Linker print version (${{ matrix.compiler.linker-command }})
       run: |
-        ld --version
+        ${{ matrix.compiler.linker-command }} --version
 
     - name: CMake print version
       run: |
diff --git a/.github/workflows/linux-qt6.yml b/.github/workflows/linux-qt6.yml
index 85c98db8c..e2eb35997 100644
--- a/.github/workflows/linux-qt6.yml
+++ b/.github/workflows/linux-qt6.yml
@@ -46,12 +46,14 @@ jobs:
             name: clang18
             apt: [ clang-18, lld-18 ]
             command: clang++-18
+            linker-command: ld.lld-18
 
           # Don't upgrade to v13 or v14 to test also older g++ versions
           - key: gcc
             name: gcc12
             apt: [ g++-12 ]
             command: g++-12
+            linker-command: ld
 
     steps:
     - uses: actions/checkout@v4
@@ -628,13 +630,13 @@ jobs:
         echo 'VCPKG_DEFAULT_TRIPLET=x64-linux-dynamic' >> $GITHUB_ENV
         echo "VCPKG_MAX_CONCURRENCY=$TinyParallelVcpkg" >> $GITHUB_ENV
 
-    - name: Compiler print version (${{ matrix.compiler.name }})
+    - name: Compiler print version (${{ matrix.compiler.command }})
       run: |
         ${{ matrix.compiler.command }} --version
 
-    - name: Linker print version (ld)
+    - name: Linker print version (${{ matrix.compiler.linker-command }})
       run: |
-        ld --version
+        ${{ matrix.compiler.linker-command }} --version
 
     - name: CMake print version
       run: |
diff --git a/.github/workflows/msys2-ucrt64-drivers.yml b/.github/workflows/msys2-ucrt64-drivers.yml
index 2497480fb..0b03d7bea 100644
--- a/.github/workflows/msys2-ucrt64-drivers.yml
+++ b/.github/workflows/msys2-ucrt64-drivers.yml
@@ -212,15 +212,16 @@ jobs:
 
         Get-Date -Format 'yyyyMMdd' > "$env:RUNNER_WORKSPACE/.vcpkg_upgraded_at"
 
-    - name: Compiler print version (${{ matrix.compiler.name }})
+    - name: Compiler print version (${{ matrix.compiler.command }})
       shell: msys2 {0}
       run: |
         ${{ matrix.compiler.command }} --version
 
-    - name: Linker print version (ldd.exe)
+    # On MSYS2 is the lld linker used for both g++ and also clang++
+    - name: Linker print version (ld.lld.exe)
       shell: msys2 {0}
       run: |
-        ldd.exe --version
+        ld.lld.exe --version
 
     - name: Linker print version (ld.exe - unused!)
       shell: msys2 {0}
diff --git a/.github/workflows/msys2-ucrt64.yml b/.github/workflows/msys2-ucrt64.yml
index ae1d3ad27..86710bb5d 100644
--- a/.github/workflows/msys2-ucrt64.yml
+++ b/.github/workflows/msys2-ucrt64.yml
@@ -364,15 +364,16 @@ jobs:
         echo 'VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-dynamic' >> $GITHUB_ENV
         echo "VCPKG_MAX_CONCURRENCY=$TinyParallelVcpkg" >> $GITHUB_ENV
 
-    - name: Compiler print version (${{ matrix.compiler.name }})
+    - name: Compiler print version (${{ matrix.compiler.command }})
       shell: msys2 {0}
       run: |
         ${{ matrix.compiler.command }} --version
 
-    - name: Linker print version (ldd.exe)
+    # On MSYS2 is the lld linker used for both g++ and also clang++
+    - name: Linker print version (ld.lld.exe)
       shell: msys2 {0}
       run: |
-        ldd.exe --version
+        ld.lld.exe --version
 
     - name: Linker print version (ld.exe - unused!)
       shell: msys2 {0}