From 0475974c99190b71e7fdbfa679b963dd27002c7a Mon Sep 17 00:00:00 2001
From: James <jwrober@gmail.com>
Date: Sat, 30 Mar 2024 14:03:20 -0500
Subject: [PATCH 1/2] Update vcpkgGitCommitId for Alpha6

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index de5be625c6..fd8b939a4b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -197,7 +197,7 @@ jobs:
       - uses: lukka/run-vcpkg@v11
         name: Install dependencies
         with:
-          vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
+          vcpkgGitCommitId: a34c873a9717a888f58dc05268dea15592c2f0ff
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1
       - name: Configure
@@ -239,7 +239,7 @@ jobs:
       - uses: lukka/run-vcpkg@v11
         name: Install dependencies
         with:
-          vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
+          vcpkgGitCommitId: a34c873a9717a888f58dc05268dea15592c2f0ff
       - name: Build
         uses: lukka/run-cmake@v10
         with:

From e9a0928637ee988bed0b64dcda3a25c497e02541 Mon Sep 17 00:00:00 2001
From: James <jwrober@gmail.com>
Date: Sat, 30 Mar 2024 14:04:03 -0500
Subject: [PATCH 2/2] Remove 32bit windows package

---
 .github/workflows/release.yaml | 52 ----------------------------------
 1 file changed, 52 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4d5457100e..01110e4f48 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -72,55 +72,3 @@ jobs:
             build/Freeciv21-${{github.ref_name}}.tar.gz.sha256
             build/Freeciv21-${{github.ref_name}}.zip
             build/Freeciv21-${{github.ref_name}}.zip.sha256
-  i686-windows:
-    name: "Create i686 Windows Package"
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    if: github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW32
-          update: true
-          install: |
-            git
-            mingw-w64-i686-cmake
-            mingw-w64-i686-ninja
-            mingw-w64-i686-nsis
-            mingw-w64-i686-gcc
-            mingw-w64-i686-libunwind
-            mingw-w64-i686-readline
-            mingw-w64-i686-lua
-            mingw-w64-i686-SDL2_mixer
-            mingw-w64-i686-qt5-base
-            mingw-w64-i686-qt5-svg
-            mingw-w64-i686-karchive-qt5
-      - name: Configure
-        run: |
-          export PATH=/mingw32/bin:${PATH}
-          export MSYSTEM=MINGW32
-          export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig
-          cmake . -B build -G Ninja \
-           -DCMAKE_INSTALL_PREFIX=$PWD/build/install \
-           -DCMAKE_BUILD_TYPE=Release
-      - name: Build
-        run: |
-          cmake --build build
-      - name: Install
-        run: |
-          cmake --build build --target install
-      - name: Package
-        run: |
-          cmake --build build --target package
-      - name: Upload package
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: |
-            build/Windows-i686/Freeciv21-*-Windows-i686.exe
-            build/Windows-i686/Freeciv21-*-Windows-i686.exe.sha256