]> granicus.if.org Git - fortune-mod/commitdiff
gh actions #3: win32 fix pacman
authorShlomi Fish <shlomif@shlomifish.org>
Sat, 30 Apr 2022 10:36:26 +0000 (13:36 +0300)
committerShlomi Fish <shlomif@shlomifish.org>
Sat, 30 Apr 2022 10:36:26 +0000 (13:36 +0300)
.github/workflows/windows-x64.yml
CI-testing/translate-travis.yml-to-github-actions.py

index 897d28c6d59e21b2fc032062b2f9f62923495ebd..93feaeb77f26865b75a840d4e81db5c38831db7a 100644 (file)
@@ -64,8 +64,8 @@ jobs:
 
                 SET VERBOSE=1
 
-                pacman -S mingw-w64-x86_64-libsystre || ( echo Failed & exit /B 1
-                )
+                c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy mingw-w64-x86_64-libsystre"
+                || ( echo Failed & exit /B 1 )
 
                 c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu" || ( echo Failed
                 & exit /B 1 )
index 361f68caa74dfe36505010bff40c6166d0e27d19..01c597c93759df156f8812256708f2f367f6d8ed 100644 (file)
@@ -193,7 +193,9 @@ def generate_windows_yaml(plat, output_path, is_act):
             cmds.insert(idx, "SET CXX=c++")
             cmds.insert(idx, "SET CC=cc")
         elif plat == 'x64':
-            cmds.insert(idx, "pacman -S mingw-w64-x86_64-libsystre")
+            cmds.insert(
+                idx, "c:\\msys64\\usr\\bin\\bash -lc "
+                "\"pacman --noconfirm -Sy mingw-w64-x86_64-libsystre\"")
 
         for cmd in cmds:
             if cmd.startswith("copy C:\\msys64\\mingw64\\bin" +