gh actions #10: mswin64: cmake/strawberry

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index ee848005ae070fa95717e6f428a23c73231b282b..7931c4c2c04950d87e65e4cf3b33d691e6ad643f 100644 (file)
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -108,8 +108,8 @@ jobs:
 
                 cd libtap\b || ( echo Failed & exit /B 1 )
 
-                cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM%
-                -DCMAKE_INSTALL_PREFIX=C:\libtap .. || ( echo Failed & exit /B 1 )
+                cmake -G "MinGW Makefiles"  -DCMAKE_INSTALL_PREFIX=C:\libtap .. ||
+                ( echo Failed & exit /B 1 )
 
                 echo %PATH% || ( echo Failed & exit /B 1 )
 
@@ -126,8 +126,8 @@ jobs:
 
                 cd rinutils\b || ( echo Failed & exit /B 1 )
 
-                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM%
-                -DCMAKE_INSTALL_PREFIX=C:\libtap .. || ( echo Failed & exit /B 1 )
+                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF  -DCMAKE_INSTALL_PREFIX=C:\libtap
+                .. || ( echo Failed & exit /B 1 )
 
                 echo %PATH% || ( echo Failed & exit /B 1 )
 
@@ -141,9 +141,8 @@ jobs:
 
                 cd ..\b32 || ( echo Failed & exit /B 1 )
 
-                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM%
-                -DCMAKE_INSTALL_PREFIX=C:\libtap32 .. || ( echo Failed & exit /B 1
-                )
+                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF  -DCMAKE_INSTALL_PREFIX=C:\libtap32
+                .. || ( echo Failed & exit /B 1 )
 
                 echo %PATH% || ( echo Failed & exit /B 1 )
 

diff --git a/CI-testing/translate-travis.yml-to-github-actions.py b/CI-testing/translate-travis.yml-to-github-actions.py
index 65210e97cd9d45ee836200d0e4f12d88453bfb5a..364d147d0e62b999726a7b05e95458d502561d3e 100644 (file)
--- a/CI-testing/translate-travis.yml-to-github-actions.py
+++ b/CI-testing/translate-travis.yml-to-github-actions.py
@@ -210,6 +210,7 @@ def generate_windows_yaml(plat, output_path, is_act):
                 continue
             if "strawberry" in cmd:
                 continue
+            cmd = re.sub("\\S*CMAKE_MAKE_PROGRAM\\S*", "", cmd)
             if "choco install strawberryperl" not in cmd:
                 if 0:
                     r = re.sub(