From 4afd0eae3023c437610fbccd6570788b10cc5825 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 18 Apr 2025 17:58:02 +0200
Subject: [PATCH 01/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index fbb882aa2..30ae569d8 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -210,7 +210,6 @@ jobs:
             make_package: 1
 
           - target: 14
-            soc: Apple
             os: macos-14
             xcode: "15.4"
             type: Release
@@ -218,7 +217,6 @@ jobs:
             make_package: 1
 
           - target: 15
-            soc: Apple
             os: macos-15
             xcode: "16.2"
             type: Release
@@ -226,7 +224,6 @@ jobs:
             make_package: 1
 
           - target: 15
-            soc: Apple
             os: macos-15
             xcode: "16.2"
             type: Debug
@@ -349,13 +346,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - target: 7
-            qt_version: 5.15.*
-            qt_arch: msvc2019_64
-
           - target: 10
             qt_version: 6.6.*
-            qt_arch: msvc2019_64
+            qt_arch: msvc2022_64
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}
@@ -383,7 +376,6 @@ jobs:
           setup-python: false
           version: ${{matrix.qt_version}}
           arch: win64_${{matrix.qt_arch}}
-          tools: ${{matrix.qt_tools}}
           modules: ${{matrix.qt_modules}}
 
       - name: Run vcpkg

From 29c3f1fa7a40ea0d0307ae4a316f3ba16e0d83bf Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 18 Apr 2025 18:04:17 +0200
Subject: [PATCH 02/22] versions

---
 .github/workflows/desktop-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 30ae569d8..5a37fc9ff 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -218,14 +218,14 @@ jobs:
 
           - target: 15
             os: macos-15
-            xcode: "16.2"
+            xcode: "16.3"
             type: Release
             core_count: 3
             make_package: 1
 
           - target: 15
             os: macos-15
-            xcode: "16.2"
+            xcode: "16.3"
             type: Debug
             core_count: 3
 
@@ -347,7 +347,7 @@ jobs:
       matrix:
         include:
           - target: 10
-            qt_version: 6.6.*
+            qt_version: 6.8.*
             qt_arch: msvc2022_64
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 

From 2786226e998504f537779bdefb942a62bd03adba Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 18 Apr 2025 20:16:53 +0200
Subject: [PATCH 03/22] ninja

---
 .ci/compile.sh | 51 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index 1588c0d5f..e700d2131 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -1,21 +1,25 @@
 #!/bin/bash
 
-# This script is to be used by the ci environment from the project root directory, do not use it from somewhere else.
+# This script is to be used by the CI environment from the project root directory, do not use it from somewhere else.
 
-# Compiles cockatrice inside of a ci environment
+# Compiles cockatrice inside of a CI environment
 # --install runs make install
 # --package [<package type>] runs make package, optionally force the type
 # --suffix <suffix> renames package with this suffix, requires arg
 # --server compiles servatrice
 # --test runs tests
-# --debug or --release sets the build type ie CMAKE_BUILD_TYPE
+# --debug or --release sets the build type (CMAKE_BUILD_TYPE)
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
 # --dir <dir> sets the name of the build dir, default is "build"
 # --parallel <core count> sets how many cores cmake should build with in parallel
+# --ninja use Ninja for building (default if Ninja is available)
+# --make use Make for building (fallback if Ninja is unavailable)
 # uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR PARALLEL_COUNT
 # (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir> --parallel <core_count>)
 # exitcode: 1 for failure, 3 for invalid arguments
 
+USE_NINJA=
+
 # Read arguments
 while [[ $# != 0 ]]; do
   case "$1" in
@@ -85,6 +89,14 @@ while [[ $# != 0 ]]; do
       PARALLEL_COUNT="$1"
       shift
       ;;
+    '--ninja')
+      USE_NINJA=1
+      shift
+      ;;
+    '--make')
+      USE_NINJA=
+      shift
+      ;;
     *)
       echo "::error file=$0::unrecognized option: $1"
       exit 3
@@ -124,17 +136,23 @@ if [[ $PACKAGE_TYPE ]]; then
   flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
 fi
 
+# Auto-detect Ninja if not explicitly set
+if [[ -z "$USE_NINJA" ]]; then
+  if command -v ninja &>/dev/null; then
+    USE_NINJA=1
+    echo "::notice::Using Ninja generator by default"
+  else
+    echo "::notice::Ninja not found, falling back to Make"
+  fi
+fi
+
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
-if [[ $PARALLEL_COUNT ]]; then
-  if [[ $(cmake --build /not_a_dir --parallel 2>&1 | head -1) =~ parallel ]]; then
-    # workaround for bionic having an old cmake
-    echo "this version of cmake does not support --parallel, using native build tool -j instead"
-    buildflags+=(-- -j "$PARALLEL_COUNT")
-    # note, no normal build flags should be added after this
-  else
-    buildflags+=(--parallel "$PARALLEL_COUNT")
-  fi
+
+# Remove parallelism flag for Ninja (it handles this automatically)
+if [[ ! $USE_NINJA && $PARALLEL_COUNT ]]; then
+  # Only use parallelism flag if using Make (not Ninja)
+  buildflags+=(--parallel "$PARALLEL_COUNT")
 fi
 
 function ccachestatsverbose() {
@@ -156,13 +174,18 @@ fi
 
 echo "::group::Configure cmake"
 cmake --version
-cmake .. "${flags[@]}"
+if [[ $USE_NINJA ]]; then
+  cmake -G Ninja .. "${flags[@]}"
+else
+  cmake .. "${flags[@]}"
+fi
 echo "::endgroup::"
 
 echo "::group::Build project"
 if [[ $RUNNER_OS == Windows ]]; then
   # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
   # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
+  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
   cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
 else
   cmake --build . "${buildflags[@]}"
@@ -200,7 +223,7 @@ if [[ $MAKE_PACKAGE ]]; then
 
   if [[ $PACKAGE_SUFFIX ]]; then
     echo "::group::Update package name"
-    cd ..
+    cd .. 
     BUILD_DIR="$BUILD_DIR" .ci/name_build.sh "$PACKAGE_SUFFIX"
     echo "::endgroup::"
   fi

From 0c59e49a57597ca9b6c3fdde7a8958a84f24e94c Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 18 Apr 2025 22:39:53 +0200
Subject: [PATCH 04/22] Update compile.sh

---
 .ci/compile.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index e700d2131..295e23823 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -185,8 +185,8 @@ echo "::group::Build project"
 if [[ $RUNNER_OS == Windows ]]; then
   # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
   # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
+  # cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
+  cmake --build . "${buildflags[@]}"
 else
   cmake --build . "${buildflags[@]}"
 fi
@@ -223,7 +223,7 @@ if [[ $MAKE_PACKAGE ]]; then
 
   if [[ $PACKAGE_SUFFIX ]]; then
     echo "::group::Update package name"
-    cd .. 
+    cd ..
     BUILD_DIR="$BUILD_DIR" .ci/name_build.sh "$PACKAGE_SUFFIX"
     echo "::endgroup::"
   fi

From e8651a02304c91f349cf98a2ba27ffb7bad57a08 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 18 Apr 2025 23:35:47 +0200
Subject: [PATCH 05/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 5a37fc9ff..51d90cf47 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -347,7 +347,7 @@ jobs:
       matrix:
         include:
           - target: 10
-            qt_version: 6.8.*
+            qt_version: 6.6.*
             qt_arch: msvc2022_64
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 

From e5a6bb0bcb2ec5e9db4c72202587ed547ca16558 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 19 Apr 2025 07:15:57 +0200
Subject: [PATCH 06/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 51d90cf47..aa2f5a185 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -377,6 +377,7 @@ jobs:
           version: ${{matrix.qt_version}}
           arch: win64_${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
+          tools: ${{matrix.qt_tools}}
 
       - name: Run vcpkg
         uses: lukka/run-vcpkg@v11

From 99b46336d43bfbae6994853f85831799ba252a57 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 19 Apr 2025 07:26:28 +0200
Subject: [PATCH 07/22] revert ninja

---
 .ci/compile.sh | 51 ++++++++++++++------------------------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index 295e23823..1588c0d5f 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -1,25 +1,21 @@
 #!/bin/bash
 
-# This script is to be used by the CI environment from the project root directory, do not use it from somewhere else.
+# This script is to be used by the ci environment from the project root directory, do not use it from somewhere else.
 
-# Compiles cockatrice inside of a CI environment
+# Compiles cockatrice inside of a ci environment
 # --install runs make install
 # --package [<package type>] runs make package, optionally force the type
 # --suffix <suffix> renames package with this suffix, requires arg
 # --server compiles servatrice
 # --test runs tests
-# --debug or --release sets the build type (CMAKE_BUILD_TYPE)
+# --debug or --release sets the build type ie CMAKE_BUILD_TYPE
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
 # --dir <dir> sets the name of the build dir, default is "build"
 # --parallel <core count> sets how many cores cmake should build with in parallel
-# --ninja use Ninja for building (default if Ninja is available)
-# --make use Make for building (fallback if Ninja is unavailable)
 # uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR PARALLEL_COUNT
 # (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir> --parallel <core_count>)
 # exitcode: 1 for failure, 3 for invalid arguments
 
-USE_NINJA=
-
 # Read arguments
 while [[ $# != 0 ]]; do
   case "$1" in
@@ -89,14 +85,6 @@ while [[ $# != 0 ]]; do
       PARALLEL_COUNT="$1"
       shift
       ;;
-    '--ninja')
-      USE_NINJA=1
-      shift
-      ;;
-    '--make')
-      USE_NINJA=
-      shift
-      ;;
     *)
       echo "::error file=$0::unrecognized option: $1"
       exit 3
@@ -136,23 +124,17 @@ if [[ $PACKAGE_TYPE ]]; then
   flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
 fi
 
-# Auto-detect Ninja if not explicitly set
-if [[ -z "$USE_NINJA" ]]; then
-  if command -v ninja &>/dev/null; then
-    USE_NINJA=1
-    echo "::notice::Using Ninja generator by default"
-  else
-    echo "::notice::Ninja not found, falling back to Make"
-  fi
-fi
-
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
-
-# Remove parallelism flag for Ninja (it handles this automatically)
-if [[ ! $USE_NINJA && $PARALLEL_COUNT ]]; then
-  # Only use parallelism flag if using Make (not Ninja)
-  buildflags+=(--parallel "$PARALLEL_COUNT")
+if [[ $PARALLEL_COUNT ]]; then
+  if [[ $(cmake --build /not_a_dir --parallel 2>&1 | head -1) =~ parallel ]]; then
+    # workaround for bionic having an old cmake
+    echo "this version of cmake does not support --parallel, using native build tool -j instead"
+    buildflags+=(-- -j "$PARALLEL_COUNT")
+    # note, no normal build flags should be added after this
+  else
+    buildflags+=(--parallel "$PARALLEL_COUNT")
+  fi
 fi
 
 function ccachestatsverbose() {
@@ -174,19 +156,14 @@ fi
 
 echo "::group::Configure cmake"
 cmake --version
-if [[ $USE_NINJA ]]; then
-  cmake -G Ninja .. "${flags[@]}"
-else
-  cmake .. "${flags[@]}"
-fi
+cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 echo "::group::Build project"
 if [[ $RUNNER_OS == Windows ]]; then
   # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
   # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  # cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
-  cmake --build . "${buildflags[@]}"
+  cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
 else
   cmake --build . "${buildflags[@]}"
 fi

From 42ddb70bc3130106b8ab68e262d8eeb1b4998a79 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 19 Apr 2025 07:32:55 +0200
Subject: [PATCH 08/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index aa2f5a185..de5c34fc1 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -348,7 +348,7 @@ jobs:
         include:
           - target: 10
             qt_version: 6.6.*
-            qt_arch: msvc2022_64
+            qt_arch: msvc2019_64  # msvc2022_64 is only available starting Qt 6.8, which introduces a bug in game window
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}
@@ -377,7 +377,6 @@ jobs:
           version: ${{matrix.qt_version}}
           arch: win64_${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
-          tools: ${{matrix.qt_tools}}
 
       - name: Run vcpkg
         uses: lukka/run-vcpkg@v11

From 3b819e3c5ed6eb5ccbcf8b731d052f11f4551408 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 19 Apr 2025 10:03:46 +0200
Subject: [PATCH 09/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index de5c34fc1..53116afca 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -348,7 +348,7 @@ jobs:
         include:
           - target: 10
             qt_version: 6.6.*
-            qt_arch: msvc2019_64  # msvc2022_64 is only available starting Qt 6.8, which introduces a bug in game window
+            qt_arch: win64_msvc2022_64
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}

From b9b0311cc4d7d1062faeea8ebd56579318f759ee Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 19 Apr 2025 10:09:38 +0200
Subject: [PATCH 10/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 53116afca..2b4ac497b 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -348,7 +348,7 @@ jobs:
         include:
           - target: 10
             qt_version: 6.6.*
-            qt_arch: win64_msvc2022_64
+            qt_arch: msvc2019_64  # win64_msvc2022_64 is only available starting Qt 6.8, which introduces a bug in game window
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}

From 0cb06ff0dd539d5cc61cff4cf7bdc37396fd40f7 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 20 Apr 2025 15:16:57 +0200
Subject: [PATCH 11/22] confirm cache issue fixed?

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 2b4ac497b..596489e45 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -379,7 +379,7 @@ jobs:
           modules: ${{matrix.qt_modules}}
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@v11
+        uses: lukka/run-vcpkg@dev/cache-v4
         with:
           runVcpkgInstall: true
           doNotCache: false

From 382f37f2a7c89321449c3f35ff5451845e3e4d26 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Tue, 22 Apr 2025 23:43:12 +0200
Subject: [PATCH 12/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 596489e45..5b9da99fd 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -255,10 +255,10 @@ jobs:
         shell: bash
         id: build
         env:
-          BUILDTYPE: '${{matrix.type}}'
+          BUILDTYPE: ${{ matrix.type }}
           MAKE_TEST: 1
-          MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
+          MAKE_PACKAGE: ${{ matrix.make_package }}
+          PACKAGE_SUFFIX: -macOS${{ matrix.target }}${{ matrix.soc == 'Intel' && '_Intel' || '' }}
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}

From 693fcc07e6e8c9320665b9534fdd71347196095d Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Tue, 22 Apr 2025 23:53:32 +0200
Subject: [PATCH 13/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 5b9da99fd..c54e16e12 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -373,7 +373,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           cache: true
-          setup-python: false
+          setup-python: true  # temp workaround to fix action until new aqtversion is released
           version: ${{matrix.qt_version}}
           arch: win64_${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}

From 54afb34398323e23b4084f96360f57e21767aa8d Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 26 Apr 2025 23:56:27 +0200
Subject: [PATCH 14/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index c54e16e12..329e84c17 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -379,7 +379,7 @@ jobs:
           modules: ${{matrix.qt_modules}}
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@dev/cache-v4
+        uses: lukka/run-vcpkg@11
         with:
           runVcpkgInstall: true
           doNotCache: false

From e6603d3b4a3a6143d10ece0d5781539c6807aadf Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 26 Apr 2025 23:57:39 +0200
Subject: [PATCH 15/22] Update desktop-build.yml

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 329e84c17..024abf1bf 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -373,13 +373,13 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           cache: true
-          setup-python: true  # temp workaround to fix action until new aqtversion is released
+          setup-python: true
           version: ${{matrix.qt_version}}
           arch: win64_${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@11
+        uses: lukka/run-vcpkg@v11
         with:
           runVcpkgInstall: true
           doNotCache: false

From 5d7f8ae49d4d28386b826c43a916ba3e3c68b161 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 27 Apr 2025 07:30:03 +0200
Subject: [PATCH 16/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 024abf1bf..331c1ac97 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -381,7 +381,7 @@ jobs:
       - name: Run vcpkg
         uses: lukka/run-vcpkg@v11
         with:
-          runVcpkgInstall: true
+          runVcpkgInstall: false
           doNotCache: false
         env:
           VCPKG_DEFAULT_TRIPLET: 'x64-windows'

From c8823838b36e000527349ed8a7a00fa12010189a Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 27 Apr 2025 10:38:15 +0200
Subject: [PATCH 17/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 331c1ac97..4afc14da5 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -382,7 +382,7 @@ jobs:
         uses: lukka/run-vcpkg@v11
         with:
           runVcpkgInstall: false
-          doNotCache: false
+          doNotCache: true
         env:
           VCPKG_DEFAULT_TRIPLET: 'x64-windows'
           VCPKG_DISABLE_METRICS: 1

From 03a44a4c06637e4e4d1fcfdf6cec0958035d78fe Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 27 Apr 2025 11:50:20 +0200
Subject: [PATCH 18/22] Update desktop-build.yml

---
 .github/workflows/desktop-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 4afc14da5..4455b51ac 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -348,7 +348,7 @@ jobs:
         include:
           - target: 10
             qt_version: 6.6.*
-            qt_arch: msvc2019_64  # win64_msvc2022_64 is only available starting Qt 6.8, which introduces a bug in game window
+            qt_arch: win64_msvc2019_64  # win64_msvc2022_64 is only available with Qt 6.8, which introduces a bug in game window
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}
@@ -375,7 +375,7 @@ jobs:
           cache: true
           setup-python: true
           version: ${{matrix.qt_version}}
-          arch: win64_${{matrix.qt_arch}}
+          arch: ${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
 
       - name: Run vcpkg
@@ -394,7 +394,7 @@ jobs:
           PACKAGE_SUFFIX: '-Win${{matrix.target}}'
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           CMAKE_GENERATOR_PLATFORM: 'x64'
-          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
+          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\${{matrix.qt_arch}}'
         # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
         # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
         run: .ci/compile.sh --server --release --test --package

From 9353782ee4411ca8a4a25b0d3709a3dd9dc1e837 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Wed, 30 Apr 2025 04:18:08 +0200
Subject: [PATCH 19/22] Update release_template.md

---
 .ci/release_template.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci/release_template.md b/.ci/release_template.md
index c23e285c3..75717bb5f 100644
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -10,7 +10,6 @@ Available pre-compiled binaries for installation:
 
   <b>Windows</b>
    • <kbd>Windows 10+</kbd>
-   • <kbd>Windows 7+</kbd>
 
   <b>macOS</b>
    • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>

From b1ed15220771f8b75f6b1d062077db71de0c129e Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 10 May 2025 18:09:00 +0200
Subject: [PATCH 20/22] vcpkg -cache action

---
 .github/workflows/desktop-build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 4455b51ac..ea1efec12 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -387,6 +387,12 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: 'x64-windows'
           VCPKG_DISABLE_METRICS: 1
 
+      - name: Setup vcpkg cache
+        id: vcpkg-cache
+        uses: TAServers/vcpkg-cache@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build Cockatrice
         id: build
         shell: bash
@@ -395,6 +401,8 @@ jobs:
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           CMAKE_GENERATOR_PLATFORM: 'x64'
           QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\${{matrix.qt_arch}}'
+          VCPKG_FEATURE_FLAGS: 'binarycaching' # Possibly redundant, but explicitly sets the binary caching feature flag
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
         # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
         # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
         run: .ci/compile.sh --server --release --test --package

From 3243e2b8b62908274f1c70bc43cf20f9b9c552cb Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 10 May 2025 19:31:16 +0200
Subject: [PATCH 21/22] vcpkg-cache /2

---
 .github/workflows/desktop-build.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index ea1efec12..a1045334e 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -378,21 +378,23 @@ jobs:
           arch: ${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
 
-      - name: Run vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: false
-          doNotCache: true
-        env:
-          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
-          VCPKG_DISABLE_METRICS: 1
-
       - name: Setup vcpkg cache
         id: vcpkg-cache
         uses: TAServers/vcpkg-cache@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Run vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          runVcpkgInstall: true
+          doNotCache: true
+        env:
+          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
+          VCPKG_DISABLE_METRICS: 1
+          VCPKG_FEATURE_FLAGS: 'binarycaching' # Possibly redundant, but explicitly sets the binary caching feature flag
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
+
       - name: Build Cockatrice
         id: build
         shell: bash

From 99916272d091fd456ba195c01e3f486ff933080a Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 10 May 2025 20:02:45 +0200
Subject: [PATCH 22/22] cleanup

---
 .github/workflows/desktop-build.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 4d106c44a..6e1b29aa2 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -385,17 +385,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Run vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
-          doNotCache: true
-        env:
-          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
-          VCPKG_DISABLE_METRICS: 1
-          VCPKG_FEATURE_FLAGS: 'binarycaching' # Possibly redundant, but explicitly sets the binary caching feature flag
-          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-
       - name: Build Cockatrice
         id: build
         shell: bash
@@ -404,7 +393,6 @@ jobs:
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           CMAKE_GENERATOR_PLATFORM: 'x64'
           QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\${{matrix.qt_arch}}'
-          VCPKG_FEATURE_FLAGS: 'binarycaching' # Possibly redundant, but explicitly sets the binary caching feature flag
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
         # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
         # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/