workflows bugfix used cygpath

silverqx · Jun 12, 2024 · 68af157 · 68af157
1 parent 9a2dcd0
commit 68af157
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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 }}