gh actions #3: mswin64: avoid copy

diff --git a/.appveyor.yml b/.appveyor.yml
index 995bc9462d57e2e4cb15a511cf5a129e3ca338dc..5568d7c7bf8bac9ac639e65de66c57940ac73641 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,7 +29,7 @@ install:
     - dir C:\msys64
     - dir C:\msys64\mingw64
     - dir C:\msys64\mingw64\bin
-    - dir C:\msys64\mingw64\bin\*make*.exe
+    # - dir C:\msys64\mingw64\bin\*make*.exe
     - copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
     # - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
     # - SET PERL5LIB=%PERL5LIB%;C:/_P5/lib/perl5

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index c15e05df878f31e1ccf4330ddd09a24940524126..cd35236f7193d4ef330c8b68d72f2cf8818b444e 100644 (file)
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -91,12 +91,6 @@ jobs:
 
                 dir C:\msys64\mingw64\bin || ( echo Failed & exit /B 1 )
 
-                dir C:\msys64\mingw64\bin\*make*.exe || ( echo Failed & exit /B 1
-                )
-
-                copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
-                || ( echo Failed & exit /B 1 )
-
                 perl -v || ( echo Failed & exit /B 1 )
 
                 git clone https://github.com/clibs/cmocka libtap || ( echo Failed

diff --git a/CI-testing/translate-travis.yml-to-github-actions.py b/CI-testing/translate-travis.yml-to-github-actions.py
index 64ba4d3af9790a3cd7fbcbb51d7c6b7241ddf65e..bb3c505ed7aa3b30e2611ab53b77049e8a455a70 100644 (file)
--- a/CI-testing/translate-travis.yml-to-github-actions.py
+++ b/CI-testing/translate-travis.yml-to-github-actions.py
@@ -194,6 +194,9 @@ def generate_windows_yaml(plat, output_path, is_act):
             cmds.insert(idx, "SET CC=cc")
 
         for cmd in cmds:
+            if cmd.startswith("copy C:\\msys64\\mingw64\\bin" +
+                              "\\mingw32-make.exe "):
+                continue
             if cmd.startswith("C:\\cygwin64\\setup"):
                 continue
             cmd = cmd.replace("cygwin64", "cygwin")