From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 11 Dec 2021 17:12:04 +0000 (+0200)
Subject: gh actions #10: mswin64: cmake/strawberry
X-Git-Tag: fortune-mod-3.8.0~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67e517aea37c29fa7d813c99fe47d2d36c8d7f36;p=fortune-mod

gh actions #10: mswin64: cmake/strawberry
---

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index ee84800..7931c4c 100644
--- 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 65210e9..364d147 100644
--- 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(