changeset 377:1b0b8e746d83 default tip

CI/windows: stupid msys2
author Paper <paper@tflc.us>
date Fri, 25 Jul 2025 12:40:25 -0400
parents 5d716acb2774
children
files .builds/windows.yml
diffstat 1 files changed, 19 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/.builds/windows.yml	Fri Jul 25 12:28:38 2025 -0400
+++ b/.builds/windows.yml	Fri Jul 25 12:40:25 2025 -0400
@@ -30,26 +30,27 @@
       python3 -m pip install --user --break-system-packages mingw-ldd
       sudo ln -nfs "$HOME/quasi-msys2-win64/root/mingw64" /mingw64
       bash -c 'export MSYSTEM=mingw64 && source ../../quasi-msys2-win64/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori64 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
-  - get-wine32: |
-      sudo dpkg --add-architecture i386
-      sudo apt-get update
-      sudo apt-get -y install wine32:i386
-  - build-win32: |
-      export WINEARCH=win32
-      export WINEPREFIX="$HOME/.wine32"
-      git clone https://github.com/holyblackcat/quasi-msys2 quasi-msys2-win32
-      cd quasi-msys2-win32
-      echo MINGW32 >msystem.txt
-      make install _gcc _qt5-base _qt5-tools _curl
-      cd ../minori
-      mkdir build32
-      cd build32
-      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      sudo ln -nfs "$HOME/quasi-msys2-win64/root/mingw32" /mingw32
-      bash -c 'export MSYSTEM=mingw32 && source ../../quasi-msys2-win32/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori32 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
+# WHOOPS! MSYS2 doesn't provide 32-bit packages anymore.
+#  - get-wine32: |
+#      sudo dpkg --add-architecture i386
+#      sudo apt-get update
+#      sudo apt-get -y install wine32:i386
+#  - build-win32: |
+#      export WINEARCH=win32
+#      export WINEPREFIX="$HOME/.wine32"
+#      git clone https://github.com/holyblackcat/quasi-msys2 quasi-msys2-win32
+#      cd quasi-msys2-win32
+#      echo MINGW32 >msystem.txt
+#      make install _gcc _qt5-base _qt5-tools _curl
+#      cd ../minori
+#      mkdir build32
+#      cd build32
+#      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
+#      sudo ln -nfs "$HOME/quasi-msys2-win64/root/mingw32" /mingw32
+#      bash -c 'export MSYSTEM=mingw32 && source ../../quasi-msys2-win32/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori32 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
 artifacts:
   - minori/build64/minori64.zip
-  - minori/build32/minori32.zip
+#  - minori/build32/minori32.zip
 triggers:
   - action: email
     condition: failure