gh actions #9: mswin64: try hostedcache strawberryperl for docmake

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index b475451307009c2f6241f26ba7b940f768ba0757..ee848005ae070fa95717e6f428a23c73231b282b 100644 (file)
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -64,21 +64,14 @@ jobs:
 
                 SET VERBOSE=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
@@ -115,8 +108,6 @@ jobs:
 
                 cd libtap\b || ( echo Failed & exit /B 1 )
 
-                set CMAKE_MAKE_PROGRAM=C:\strawberry\c\bin\gmake.exe
-
                 cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM%
                 -DCMAKE_INSTALL_PREFIX=C:\libtap .. || ( echo Failed & exit /B 1 )
 
@@ -135,8 +126,6 @@ jobs:
 
                 cd rinutils\b || ( 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 )
 
@@ -166,8 +155,6 @@ 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
index 58bfd06f295f2ebdcde1c2a87ec991bd492a77d5..65210e97cd9d45ee836200d0e4f12d88453bfb5a 100644 (file)
--- a/CI-testing/translate-travis.yml-to-github-actions.py
+++ b/CI-testing/translate-travis.yml-to-github-actions.py
@@ -208,6 +208,8 @@ def generate_windows_yaml(plat, output_path, is_act):
                 continue
             if re.search("copy.*?python\\.exe", cmd):
                 continue
+            if "strawberry" in cmd:
+                continue
             if "choco install strawberryperl" not in cmd:
                 if 0:
                     r = re.sub(