arst

Author: laverdet

.github/workflows/build-test-release.yml

@@ -137,7 +137,7 @@ jobs:
       # Install toolchain
       - name: Sources [Debian]
         if: matrix.host.platform == 'linux-gnu'
-        run: apt-get -qq install --no-install-recommends -y curl; curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
+        run: apt-get -qq install --no-install-recommends -y curl; curl -kfsSL https://deb.nodesource.com/setup_22.x | bash -
       - name: Toolchain [Linux]
         uses: laverdet/[email protected]
         if: startsWith(matrix.host.platform, 'linux-')
@@ -173,11 +173,8 @@ jobs:
         run: |
           echo ::group::Toolchain
           # Install ucrt mingw llvm
-          # cd /
-          # curl 'https://github.com/mstorsjo/llvm-mingw/releases/download/20251118/llvm-mingw-20251118-ucrt-x86_64.zip' -L | bsdtar -xvf-
-
-          # I would like to use this but can't figure it out
           winget install --accept-source-agreements --silent -e --id=MartinStorsjo.LLVM-MinGW.UCRT
+          ls -d /c/Users/runneradmin/AppData/Local/Microsoft/WinGet/Packages/MartinStorsjo.LLVM-MinGW.UCRT_Microsoft.*/llvm-mingw-*-ucrt-*/bin >> "$GITHUB_PATH"
 
           # You want the mingw version of ninja, not the msys version. The msys version uses
           # `CMD.EXE` and does not work with the cmake Ninja generator.
@@ -251,8 +248,8 @@ jobs:
               CMAKE_CXX_COMPILER=$(realpath "$(which clang++-21)")
               ;;
             win32)
-              CMAKE_C_COMPILER=/llvm-mingw-20251118-ucrt-x86_64/bin/clang++.exe
-              CMAKE_CXX_COMPILER=/llvm-mingw-20251118-ucrt-x86_64/bin/clang++.exe
+              CMAKE_C_COMPILER=$(which clang.exe)
+              CMAKE_CXX_COMPILER=$(which clang++.exe)
               # I do not know why cmake cannot find ninja without explicitly being told where it is.
               CMAKE_MAKE_PROGRAM=$(which ninja)
               CMAKE_PREFIX_PATH=C:/msys64/mingw64/lib/cmake