From 40d6b45291a6fb7c26ea984aad24191a58c8fde8 Mon Sep 17 00:00:00 2001
From: kramo <contact@kramo.page>
Date: Tue, 16 Apr 2024 19:24:35 +0200
Subject: [PATCH] See if Windows CI is fixed

---
 .github/workflows/ci.yml              | 62 +++++++++++++--------------
 .github/workflows/publish-release.yml |  4 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5cf6431..7d1c196 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,39 +22,39 @@ jobs:
         bundle: page.kramo.Cartridges.Devel.flatpak
         manifest-path: flatpak/page.kramo.Cartridges.Devel.json
 
-  # windows:
-  #   name: Windows
-  #   runs-on: windows-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
+  windows:
+    name: Windows
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-  #     - name: Setup MSYS2
-  #       uses: msys2/setup-msys2@v2
-  #       with:
-  #         msystem: UCRT64
-  #         update: true
-  #         install: mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-python-gobject mingw-w64-ucrt-x86_64-python-yaml mingw-w64-ucrt-x86_64-python-requests mingw-w64-ucrt-x86_64-python-pillow mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-meson git
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          install: mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-python-gobject mingw-w64-ucrt-x86_64-python-yaml mingw-w64-ucrt-x86_64-python-requests mingw-w64-ucrt-x86_64-python-pillow mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-meson git
 
-  #     - name: Compile
-  #       shell: msys2 {0}
-  #       run: |
-  #         meson setup _build
-  #         ninja -C _build install
-  #         pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
-  #         find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
+      - name: Compile
+        shell: msys2 {0}
+        run: |
+          meson setup _build
+          ninja -C _build install
+          pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
+          find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
 
-  #     - name: Test
-  #       shell: msys2 {0}
-  #       run: |
-  #         set +e
-  #         timeout 2 cartridges; [ "$?" -eq "124" ]
+      - name: Test
+        shell: msys2 {0}
+        run: |
+          set +e
+          timeout 2 cartridges; [ "$?" -eq "124" ]
 
-  #     - name: Inno Setup
-  #       run: iscc ".\_build\windows\Cartridges.iss"
+      - name: Inno Setup
+        run: iscc ".\_build\windows\Cartridges.iss"
 
-  #     - name: Upload Artifact
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: Windows Installer
-  #         path: _build/windows/Output/Cartridges Setup.exe
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Windows Installer
+          path: _build/windows/Output/Cartridges Setup.exe
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 2e1d90e..e118484 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Publish release
         uses: softprops/action-gh-release@v0.1.15
         with:
-          # files: Windows Installer/Cartridges Setup.exe
-          # fail_on_unmatched_files: true
+          files: Windows Installer/Cartridges Setup.exe
+          fail_on_unmatched_files: true
           tag_name: ${{ steps.get_tag_name.outputs.tag_name }}
           body_path: release_notes