From 68af157579ded37b2e6a1076aa2a8c511bb6c281 Mon Sep 17 00:00:00 2001 From: silverqx Date: Wed, 12 Jun 2024 22:21:40 +0200 Subject: [PATCH] workflows bugfix used cygpath --- .github/workflows/msys2-ucrt64-drivers.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msys2-ucrt64-drivers.yml b/.github/workflows/msys2-ucrt64-drivers.yml index acca585f6..a6deaa43f 100644 --- a/.github/workflows/msys2-ucrt64-drivers.yml +++ b/.github/workflows/msys2-ucrt64-drivers.yml @@ -34,7 +34,7 @@ jobs: TINY_PARALLEL_GCC: 3 TINY_PARALLEL_CLANG_OR_VCPKG: 9 TINY_MYSQL_SERVICE: MySQL84 - # Used by the msys2.cmd script + # Used by the msys2.cmd script and cygpath.exe MSYS2_ROOT: C:\msys64 # State variables @@ -81,6 +81,9 @@ jobs: $tinyormBuildFolder "TinyORMBuildTree=$tinyormBuildTree" >> $env:GITHUB_ENV + $tinyormBuildTreeCyg = & "$env:MSYS2_ROOT\usr\bin\cygpath.exe" --unix $tinyormBuildTree + "TinyORMBuildTreeCyg=$tinyormBuildTreeCyg" >> $env:GITHUB_ENV + $parallel = '${{ matrix.compiler.key }}' -ceq 'gcc' ? $env:TINY_PARALLEL_GCC : $env:TINY_PARALLEL_CLANG_OR_VCPKG "TinyParallel=$parallel" >> $env:GITHUB_ENV @@ -218,7 +221,7 @@ jobs: run: >- cmake.exe --log-level=DEBUG --log-context -S . - -B "$TinyORMBuildTree" + -B "$TinyORMBuildTreeCyg" -G Ninja -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache.exe -D CMAKE_CXX_COMPILER:FILEPATH=${{ matrix.compiler.command }}