try2fix gh actions

shlomif · Feb 4, 2024 · c900ef5 · c900ef5
1 parent 204c120
commit c900ef5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
@@ -67,14 +67,21 @@ jobs:
                 c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy mingw-w64-x86_64-libsystre"
                 || ( echo Failed & exit /B 1 )
 
+                IF NOT EXIST C:\strawberry ( echo "strawberryperl is not installed.
+                Please fix appveyor.yml" exit 1 ) || ( echo Failed & exit /B 1 )
+
                 c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu" || ( echo Failed
                 & exit /B 1 )
 
+                SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
+
                 perl -v || ( echo Failed & exit /B 1 )
 
                 IF NOT EXIST C:\Perl5 mkdir C:\Perl5 || ( echo Failed & exit /B 1
                 )
 
+                SET PATH=C:\msys64\mingw64\bin;C:\msys64\bin;C:\Perl5\bin;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
+
                 SET PERL5LIB=%PERL5LIB%;C:/Perl5/lib/perl5
 
                 SET PERL_LOCAL_LIB_ROOT=C:/Perl5
@@ -96,15 +103,19 @@ jobs:
 
                 perl -v || ( echo Failed & exit /B 1 )
 
+                set CMAKE_MAKE_PROGRAM=C:\strawberry\c\bin\gmake.exe
+
                 git clone https://github.com/shlomif/rinutils rinutils || ( echo Failed
                 & exit /B 1 )
 
                 mkdir rinutils\b || ( echo Failed & exit /B 1 )
 
                 cd rinutils\b || ( echo Failed & exit /B 1 )
 
-                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF  -DCMAKE_INSTALL_PREFIX=C:\libtap
-                .. || ( echo Failed & exit /B 1 )
+                set CMAKE_MAKE_PROGRAM=C:\strawberry\c\bin\gmake.exe
+
+                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM%
+                -DCMAKE_INSTALL_PREFIX=C:\libtap .. || ( echo Failed & exit /B 1 )
 
                 echo %PATH% || ( echo Failed & exit /B 1 )
 
@@ -118,8 +129,9 @@ jobs:
 
                 cd ..\b32 || ( echo Failed & exit /B 1 )
 
-                cmake -G "MinGW Makefiles" -DWITH_TEST_SUITE=OFF  -DCMAKE_INSTALL_PREFIX=C:\libtap32
-                .. || ( 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
+                )
 
                 echo %PATH% || ( echo Failed & exit /B 1 )
 
@@ -131,6 +143,8 @@ jobs:
 
                 cd ..\..\ || ( echo Failed & exit /B 1 )
 
+                set CMAKE_MAKE_PROGRAM=C:\strawberry\c\bin\gmake.exe
+
                 set CPATH=c:\mingw64\include;c:\msys64\mingw64\include
 
                 set LIBRARY_PATH=c:\mingw64\lib;c:\msys64\mingw64\lib

diff --git a/CI-testing/translate-travis.yml-to-github-actions.py b/CI-testing/translate-travis.yml-to-github-actions.py
@@ -242,9 +242,10 @@ def _calc_batch_code(cmds):
                 continue
             if re.search("copy.*?python\\.exe", cmd):
                 continue
-            if "strawberry" in cmd:
-                continue
-            cmd = re.sub("\\S*CMAKE_MAKE_PROGRAM\\S*", "", cmd)
+            if 0:
+                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(