diff .builds/windows.yml @ 249:6b2441c776dd

*: merge
author Paper <mrpapersonic@gmail.com>
date Wed, 24 Jan 2024 20:18:59 -0500
parents f475e168fac8
children
line wrap: on
line diff
--- a/.builds/windows.yml	Wed Jan 24 20:18:14 2024 -0500
+++ b/.builds/windows.yml	Wed Jan 24 20:18:59 2024 -0500
@@ -1,47 +1,35 @@
 image: debian/bookworm
 packages:
-  - wget
-  - tar
-  - zstd
-  - gpg
-  - clang
-  - lld
-  - xz-utils
-  - wine
-  - cmake
-  - ncurses-bin
-  - qtbase5-dev
-  - qttools5-dev
+  - automake
+  - autoconf
+  - libtool
 sources:
   - https://hg.sr.ht/~mrpapersonic/minori
-environment:
-  BUILD_SUBMITTER: hg.sr.ht
 tasks:
-  - build-win64: |
-      export WINEARCH=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 _autotools
-      cd ../minori
-      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      bash -c 'source ../../quasi-msys2-win64/env/all.src && autoreconf -i && cd dep/animia && autoreconf -i && cd ../anitomy && autoreconf -i && cd ../pugixml && autoreconf -i && ../.. && mkdir build64 && cd build64 && ../configure && make'
-  - 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'
-      bash -c 'source ../../quasi-msys2-win32/env/all.src && autoreconf -i && cd dep/animia && autoreconf -i && cd ../anitomy && autoreconf -i && cd ../pugixml && autoreconf -i && ../.. && mkdir build32 && cd build32 && ../configure && make'
+  - install-docker: |
+      # Add Docker's official GPG key:
+      sudo apt update
+      sudo apt install ca-certificates curl gnupg
+      sudo install -m 0755 -d /etc/apt/keyrings
+      curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+      sudo chmod a+r /etc/apt/keyrings/docker.gpg
+
+      # Add the repository to Apt sources:
+      echo \
+        "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+        $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+        sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+      sudo apt update
+
+      sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+  - build: |
+      export ARCH="x86_64"
+      cd minori
+      autoreconf -i
+
+      mkdir build
+      sudo docker run -e MSYSTEM=MINGW64 -w "$PWD/build" amitie10g/msys2 "/bin/bash -c 'pacman -S --noconfirm mingw-w64-$ARCH-qt5-base mingw-w64-$ARCH-qt5-translations mingw-w64-$ARCH-qt5-tools mingw-w64-$ARCH-toolchain mingw-w64-$ARCH-curl mingw-w64-$ARCH-make; ../configure; make; ../scripts/win32/deploy_build.sh'"
+
 triggers:
   - action: email
     condition: failure