workflows bugfix print compiler/linker versions

silverqx · Aug 9, 2024 · 01f886e · 01f886e
1 parent a5f217e
commit 01f886e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -215,13 +217,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
@@ -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
@@ -212,11 +212,12 @@ 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
 
+    # On MSYS2 is the lld linker used for both g++ and also clang++
     - name: Linker print version (ldd.exe)
       shell: msys2 {0}
       run: |

diff --git a/.github/workflows/msys2-ucrt64.yml b/.github/workflows/msys2-ucrt64.yml
@@ -364,11 +364,12 @@ 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
 
+    # On MSYS2 is the lld linker used for both g++ and also clang++
     - name: Linker print version (ldd.exe)
       shell: msys2 {0}
       run: |