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

gh actions #2: win32 fix

thanks to https://github.com/haskell-hvr/regex-posix/issues/4
---

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index cd35236..897d28c 100644
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -64,6 +64,9 @@ jobs:
 
                 SET VERBOSE=1
 
+                pacman -S 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/continuous-integration-testing.pl b/CI-testing/continuous-integration-testing.pl
index 7a9f3fd..28d2672 100644
--- a/CI-testing/continuous-integration-testing.pl
+++ b/CI-testing/continuous-integration-testing.pl
@@ -108,6 +108,7 @@ do_system(
                 $IS_WIN
                 ? ( $cmake_common_args
                         . "$W -DCMAKE_INSTALL_PREFIX=c:/foo "
+                        . " -DUSE_WIN32_REGEX_LIBS=TRUE "
                         . " ../fortune-mod && $MAKE && $MAKE install && $MAKE check"
                     )
                 : ( $cmake_common_args
diff --git a/CI-testing/translate-travis.yml-to-github-actions.py b/CI-testing/translate-travis.yml-to-github-actions.py
index bb3c505..361f68c 100644
--- a/CI-testing/translate-travis.yml-to-github-actions.py
+++ b/CI-testing/translate-travis.yml-to-github-actions.py
@@ -188,10 +188,12 @@ def generate_windows_yaml(plat, output_path, is_act):
         for k, v in sorted(data['environment']['global'].items()):
             # batch += "SET " + k + "=\"" + v + "\"\n"
             batch += "SET " + k + "=" + v + "\n"
+        idx = 0
         if plat == 'x86':
-            idx = 0
             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")
 
         for cmd in cmds:
             if cmd.startswith("copy C:\\msys64\\mingw64\\bin" +