From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 30 Apr 2022 10:36:26 +0000 (+0300)
Subject: gh actions #3: win32 fix pacman
X-Git-Tag: fortune-mod-3.14.0~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfaf1de0573bb13a0e2a4c06d53eaaea6dd0297e;p=fortune-mod

gh actions #3: win32 fix pacman
---

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index 897d28c..93feaeb 100644
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -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 )
diff --git a/CI-testing/translate-travis.yml-to-github-actions.py b/CI-testing/translate-travis.yml-to-github-actions.py
index 361f68c..01c597c 100644
--- a/CI-testing/translate-travis.yml-to-github-actions.py
+++ b/CI-testing/translate-travis.yml-to-github-actions.py
@@ -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" +