changeset 203:ed376fc37802

ci: combine windows build scripts
author Paper <paper@paper.us.eu.org>
date Tue, 02 Jan 2024 06:19:49 -0500
parents 71832ffe425a
children 1e7a6231f12c
files .builds/win32.yml .builds/win64.yml .builds/windows.yml
diffstat 3 files changed, 48 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/.builds/win32.yml	Tue Jan 02 06:05:06 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-image: debian/bookworm
-packages:
-  - wget
-  - tar
-  - zstd
-  - gpg
-  - clang
-  - lld
-  - xz-utils
-  - wine
-  - cmake
-  - ncurses-bin
-  - qtbase5-dev
-  - qttools5-dev
-sources:
-  - https://hg.sr.ht/~mrpapersonic/minori
-  - https://github.com/holyblackcat/quasi-msys2
-environment:
-  BUILD_SUBMITTER: hg.sr.ht
-tasks:
-  - get-wine32: |
-      sudo dpkg --add-architecture i386
-      sudo apt-get update
-      sudo apt-get -y install wine32:i386
-  - build: |
-      export WINEARCH=win32
-      cd quasi-msys2
-      echo MINGW32 >msystem.txt
-      make install _gcc _qt5-base _qt5-tools _curl
-      cd ../minori
-      mkdir build
-      cd build
-      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      bash -c 'source ../../quasi-msys2/env/all.src && cmake .. -G "Unix Makefiles" -DCMAKE_AUTOMOC_EXECUTABLE="$(which moc)" -DCMAKE_AUTORCC_EXECUTABLE="$(which rcc)" && make'
-triggers:
-  - action: email
-    condition: failure
-    to: Paper <mrpapersonic@gmail.com>
--- a/.builds/win64.yml	Tue Jan 02 06:05:06 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-image: debian/bookworm
-packages:
-  - wget
-  - tar
-  - zstd
-  - gpg
-  - clang
-  - lld
-  - xz-utils
-  - wine
-  - cmake
-  - ncurses-bin
-  - qtbase5-dev
-  - qttools5-dev
-sources:
-  - https://hg.sr.ht/~mrpapersonic/minori
-  - https://github.com/holyblackcat/quasi-msys2
-environment:
-  BUILD_SUBMITTER: hg.sr.ht
-tasks:
-  - build: |
-      cd quasi-msys2
-      echo MINGW64 >msystem.txt
-      make install _gcc _qt5-base _qt5-tools _curl
-      cd ../minori
-      mkdir build
-      cd build
-      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      bash -c 'source ../../quasi-msys2/env/all.src && export AUTOMOC_EXECUTABLE="$(which moc)" && export AUTORCC_EXECUTABLE="$(which rcc)" && cmake .. -G "Unix Makefiles" && make'
-triggers:
-  - action: email
-    condition: failure
-    to: Paper <mrpapersonic@gmail.com>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.builds/windows.yml	Tue Jan 02 06:19:49 2024 -0500
@@ -0,0 +1,48 @@
+image: debian/bookworm
+packages:
+  - wget
+  - tar
+  - zstd
+  - gpg
+  - clang
+  - lld
+  - xz-utils
+  - wine
+  - cmake
+  - ncurses-bin
+  - qtbase5-dev
+  - qttools5-dev
+sources:
+  - https://hg.sr.ht/~mrpapersonic/minori
+environment:
+  BUILD_SUBMITTER: hg.sr.ht
+tasks:
+  - build-win64: |
+      git clone https://github.com/holyblackcat/quasi-msys2 quasi-msys2-win64
+      cd quasi-msys2-win64
+      echo MINGW64 >msystem.txt
+      make install _gcc _qt5-base _qt5-tools _curl
+      cd ../minori
+      mkdir build
+      cd build
+      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
+      bash -c 'source ../../quasi-msys2/env/all.src && cmake .. -G "Unix Makefiles" -DCMAKE_AUTOMOC_EXECUTABLE="$(which moc)" -DCMAKE_AUTORCC_EXECUTABLE="$(which rcc)" && make'
+  - get-wine32: |
+      sudo dpkg --add-architecture i386
+      sudo apt-get update
+      sudo apt-get -y install wine32:i386
+  - build: |
+      export WINEARCH=win32
+      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 build
+      cd build
+      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
+      bash -c 'source ../../quasi-msys2/env/all.src && cmake .. -G "Unix Makefiles" -DCMAKE_AUTOMOC_EXECUTABLE="$(which moc)" -DCMAKE_AUTORCC_EXECUTABLE="$(which rcc)" && make'
+triggers:
+  - action: email
+    condition: failure
+    to: Paper <mrpapersonic@gmail.com>