From 1e253de2328b06a04342cfb8928e5f11d2803985 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:49:41 +0200
Subject: [PATCH 01/30] 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 74f905351..1a3f71a7c 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -337,7 +337,7 @@ jobs:
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             type: Release
 
-    name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+    name: ${{ matrix.os }} ${{ matrix.target }}${{ case(matrix.soc == 'Intel', ' Intel', '') }}${{ case(matrix.type == 'Debug', ' Debug', '') }}
     needs: configure
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 100

From 5d91a340ddc329a6fc34ad5074c48a9110488afc Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 17:33:47 +0200
Subject: [PATCH 02/30] CAPS

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 1a3f71a7c..1f3b57b50 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -79,19 +79,19 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ steps.configure.outputs.tag }}
-          target: ${{ steps.configure.outputs.sha }}
-          release_name: ${{ steps.prepare.outputs.title }}
-          body_path: ${{ steps.prepare.outputs.body_path }}
-          prerelease: ${{ steps.prepare.outputs.is_beta }}
+          TAG_NAME: ${{ steps.configure.outputs.tag }}
+          TARGET: ${{ steps.configure.outputs.sha }}
+          RELEASE_NAME: ${{ steps.prepare.outputs.title }}
+          BODY_PATH: ${{ steps.prepare.outputs.body_path }}
+          PRERELEASE: ${{ steps.prepare.outputs.is_beta }}
         run: |
           args=()
-          [[ $prerelease == yes ]] && args+=(--prerelease)
+          [[ $PRERELEASE == yes ]] && args+=(--prerelease)
 
-          gh release create "$tag_name" --verify-tag --draft "${args[@]}" \
-            --target "$target" \
-            --title "$release_name" \
-            --notes-file "$body_path"
+          gh release create "$TAG_NAME" --verify-tag --draft "${args[@]}" \
+            --target "$TARGET" \
+            --title "$RELEASE_NAME" \
+            --notes-file "$BODY_PATH"
 
   build-linux:
     strategy:
@@ -188,18 +188,18 @@ jobs:
         shell: bash
         env:
           SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
-          package: '${{ matrix.package }}'
-          server_only: '${{ matrix.server_only }}'
+          PACKAGE: '${{ matrix.package }}'
+          SERVER_ONLY: '${{ matrix.server_only }}'
         run: |
           source .ci/docker.sh
           args=()
-          [[ $server_only == yes ]] && args+=(--no-client)
+          [[ $SERVER_ONLY == yes ]] && args+=(--no-client)
           [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
           args+=(--ccache "$CCACHE_SIZE")
           args+=(--cmake-generator "$CMAKE_GENERATOR")
           args+=(--suffix "$SUFFIX")
 
-          RUN --server --release --package "$package" "${args[@]}"
+          RUN --server --release --package "$PACKAGE" "${args[@]}"
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "Delete remote compiler cache (ccache)"
@@ -234,11 +234,11 @@ jobs:
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
         shell: bash
         env:
-          asset_name: ${{ steps.build.outputs.fullname }}
-          asset_path: ${{ steps.build.outputs.path }}
+          ASSET_NAME: ${{ steps.build.outputs.fullname }}
+          ASSET_PATH: ${{ steps.build.outputs.path }}
           GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ needs.configure.outputs.tag }}
-        run: gh release upload "$tag_name" "$asset_path#$asset_name"
+          TAG_NAME: ${{ needs.configure.outputs.tag }}
+        run: gh release upload "$TAG_NAME" "$ASSET_PATH#$ASSET_NAME"
 
       - name: "Attest binary provenance"
         id: attestation
@@ -550,11 +550,11 @@ jobs:
         id: upload_release
         shell: bash
         env:
-          asset_name: ${{ steps.build.outputs.fullname }}
-          asset_path: ${{ steps.build.outputs.path }}
+          ASSET_NAME: ${{ steps.build.outputs.fullname }}
+          ASSET_PATH: ${{ steps.build.outputs.path }}
           GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ needs.configure.outputs.tag }}
-        run: gh release upload "$tag_name" "$asset_path#$asset_name"
+          TAG_NAME: ${{ needs.configure.outputs.tag }}
+        run: gh release upload "$TAG_NAME" "$ASSET_PATH#$ASSET_NAME"
 
       - name: "Attest binary provenance"
         if: steps.upload_release.outcome == 'success'

From dcb9ed0044708605a9e924c8c435ee4390681d88 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 18:06:48 +0200
Subject: [PATCH 03/30] boolean

---
 .ci/prep_release.sh                 |  6 ++---
 .github/workflows/desktop-build.yml | 38 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.ci/prep_release.sh b/.ci/prep_release.sh
index 7f4f7d961..8e830bb23 100755
--- a/.ci/prep_release.sh
+++ b/.ci/prep_release.sh
@@ -23,18 +23,18 @@ fi
 
 # create title
 if [[ $TAG =~ $beta_regex ]]; then
-  echo "is_beta=yes" >>"$GITHUB_OUTPUT"
+  echo "is_beta=true" >>"$GITHUB_OUTPUT"
   title="$TAG"
   echo "creating beta release '$title'"
 elif [[ ! $(cat CMakeLists.txt) =~ $name_regex ]]; then
   echo "::error file=$0::could not find releasename in CMakeLists.txt"
   exit 1
 else
-  echo "is_beta=no" >>"$GITHUB_OUTPUT"
+  echo "is_beta=false" >>"$GITHUB_OUTPUT"
   name="${BASH_REMATCH[1]}"
   version="${TAG##*-}"
   title="Cockatrice $version: $name"
-  no_beta=1
+  no_beta=true
   echo "friendly_name=$name" >>"$GITHUB_OUTPUT"
   echo "creating full release '$title'"
 fi
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 1f3b57b50..8b4839119 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -86,7 +86,7 @@ jobs:
           PRERELEASE: ${{ steps.prepare.outputs.is_beta }}
         run: |
           args=()
-          [[ $PRERELEASE == yes ]] && args+=(--prerelease)
+          [[ "$PRERELEASE" == "true" ]] && args+=(--prerelease)
 
           gh release create "$TAG_NAME" --verify-tag --draft "${args[@]}" \
             --target "$TARGET" \
@@ -101,14 +101,14 @@ jobs:
         include:
           - distro: Arch
 
-            allow-failure: yes
+            allow-failure: true
             package: skip    # We are packaged in Arch already
 
           - distro: Servatrice_Debian
             version: 12
 
             package: DEB
-            server_only: yes
+            server_only: true
             test: skip
 
           - distro: Debian
@@ -147,7 +147,7 @@ jobs:
     name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
+    continue-on-error: ${{ matrix.allow-failure == 'true' }}
     timeout-minutes: 70
     env:
       CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
@@ -193,8 +193,8 @@ jobs:
         run: |
           source .ci/docker.sh
           args=()
-          [[ $SERVER_ONLY == yes ]] && args+=(--no-client)
-          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
+          [[ "$SERVER_ONLY" == "true" ]] && args+=(--no-client)
+          [[ "$GITHUB_REF" == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
           args+=(--ccache "$CCACHE_SIZE")
           args+=(--cmake-generator "$CMAKE_GENERATOR")
           args+=(--suffix "$SUFFIX")
@@ -267,7 +267,7 @@ jobs:
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
-            make_package: 1
+            make_package: true
             override_target: 13
             package_suffix: "-macOS13_Intel"
             qt_version: 6.11.0
@@ -275,7 +275,7 @@ jobs:
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Intel
             type: Release
-            use_ccache: 1
+            use_ccache: true
             xcode: "16.4"
 
           - os: macOS
@@ -284,14 +284,14 @@ jobs:
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
-            make_package: 1
+            make_package: true
             package_suffix: "-macOS14"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Release
-            use_ccache: 1
+            use_ccache: true
             xcode: "15.4"
 
           - os: macOS
@@ -300,14 +300,14 @@ jobs:
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
-            make_package: 1
+            make_package: true
             package_suffix: "-macOS15"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Release
-            use_ccache: 1
+            use_ccache: true
             xcode: "16.4"
 
           - os: macOS
@@ -321,7 +321,7 @@ jobs:
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Debug
-            use_ccache: 1
+            use_ccache: true
             xcode: "16.4"
 
           - os: Windows
@@ -330,7 +330,7 @@ jobs:
 
             cmake_generator: "Visual Studio 18 2026"
             cmake_generator_platform: x64
-            make_package: 1
+            make_package: true
             package_suffix: "-Win10"
             qt_version: 6.11.0
             qt_arch: win64_msvc2022_64
@@ -359,11 +359,11 @@ jobs:
           msbuild-architecture: x64
 
       - name: "[macOS] Setup ccache"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        if: matrix.os == 'macOS' && matrix.use_ccache == 'true'
         run: brew install ccache
 
       - name: "[macOS] Restore compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        if: matrix.os == 'macOS' && matrix.use_ccache == 'true'
         id: ccache_restore
         uses: actions/cache/restore@v5
         env:
@@ -461,7 +461,7 @@ jobs:
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
+        if: matrix.os == 'macOS' && matrix.use_ccache == 'true' && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
         continue-on-error: true
         env:
           CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -472,7 +472,7 @@ jobs:
           fi
 
       - name: "[macOS] Save updated compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
+        if: matrix.os == 'macOS' && matrix.use_ccache == 'true' && github.ref == 'refs/heads/master'
         uses: actions/cache/save@v5
         with:
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -546,7 +546,7 @@ jobs:
             build/servatrice/Release/*.pdb
 
       - name: "Upload to release"
-        if: needs.configure.outputs.tag != null && matrix.make_package == '1'
+        if: needs.configure.outputs.tag != null && matrix.make_package == 'true'
         id: upload_release
         shell: bash
         env:

From 6ba561a9cb40b99dcd3f682757d1b6dcbbb17173 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 18:08:59 +0200
Subject: [PATCH 04/30] sorting

---
 .github/workflows/desktop-build.yml  | 22 +++++++++++-----------
 .github/workflows/docker-release.yml |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 8b4839119..3c55adb99 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -7,6 +7,17 @@ permissions:
   id-token: write    # needed for signing certificate in attestation
 
 on:
+  pull_request:
+    paths:
+      - '*/**'    # matches all files not in root
+      - '!**.md'
+      - '!.github/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'    # needed to match submodule bumps (gitlink)
   push:
     branches:
       - master
@@ -22,17 +33,6 @@ on:
       - 'vcpkg'    # needed to match submodule bumps (gitlink)
     tags:
       - '*'
-  pull_request:
-    paths:
-      - '*/**'    # matches all files not in root
-      - '!**.md'
-      - '!.github/**'
-      - '!.tx/**'
-      - '!doc/**'
-      - '.github/workflows/desktop-build.yml'
-      - 'CMakeLists.txt'
-      - 'vcpkg.json'
-      - 'vcpkg'    # needed to match submodule bumps (gitlink)
 
 # Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index b479322d0..9c65e345b 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -5,15 +5,15 @@ permissions:
   packages: write
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
       - master
     paths:
       - '.github/workflows/docker-release.yml'
       - 'Dockerfile'
+  push:
+    branches:
+      - master
   release:
     types:
       - released    # publishing of stable releases

From 201beffb63260095fc987d7633c8c4b881112758 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 18:28:45 +0200
Subject: [PATCH 05/30] 1 --> true

https://learn.microsoft.com/en-us/vcpkg/users/config-environment#vcpkg_disable_metrics
---
 .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 3c55adb99..0580fa783 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -456,7 +456,7 @@ jobs:
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
           USE_CCACHE: ${{ matrix.use_ccache }}
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-          VCPKG_DISABLE_METRICS: 1
+          VCPKG_DISABLE_METRICS: true
         run: .ci/compile.sh --server --test --vcpkg
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342

From f90a3411eee6782391b9de3cc68fd824b48daae3 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 18:41:28 +0200
Subject: [PATCH 06/30] fix comparisons

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 0580fa783..187440b41 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -147,7 +147,7 @@ jobs:
     name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.allow-failure == 'true' }}
+    continue-on-error: ${{ matrix.allow-failure == true }}
     timeout-minutes: 70
     env:
       CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
@@ -359,11 +359,11 @@ jobs:
           msbuild-architecture: x64
 
       - name: "[macOS] Setup ccache"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 'true'
+        if: matrix.os == 'macOS' && matrix.use_ccache == true
         run: brew install ccache
 
       - name: "[macOS] Restore compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 'true'
+        if: matrix.os == 'macOS' && matrix.use_ccache == true
         id: ccache_restore
         uses: actions/cache/restore@v5
         env:
@@ -461,7 +461,7 @@ jobs:
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 'true' && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
+        if: matrix.os == 'macOS' && matrix.use_ccache == true && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
         continue-on-error: true
         env:
           CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -472,7 +472,7 @@ jobs:
           fi
 
       - name: "[macOS] Save updated compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 'true' && github.ref == 'refs/heads/master'
+        if: matrix.os == 'macOS' && matrix.use_ccache == true && github.ref == 'refs/heads/master'
         uses: actions/cache/save@v5
         with:
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -546,7 +546,7 @@ jobs:
             build/servatrice/Release/*.pdb
 
       - name: "Upload to release"
-        if: needs.configure.outputs.tag != null && matrix.make_package == 'true'
+        if: needs.configure.outputs.tag != null && matrix.make_package == true
         id: upload_release
         shell: bash
         env:

From a48b46416ebf5656da647900b78a6234acb1e33a Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 21 Jun 2026 19:32:20 +0200
Subject: [PATCH 07/30] skip --> false

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 187440b41..ac85522d2 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -102,20 +102,20 @@ jobs:
           - distro: Arch
 
             allow-failure: true
-            package: skip    # We are packaged in Arch already
+            package: false    # We are packaged in Arch already
 
           - distro: Servatrice_Debian
             version: 12
 
             package: DEB
             server_only: true
-            test: skip
+            test: false
 
           - distro: Debian
             version: 12
 
             package: DEB
-            test: skip    # Running tests on all distros is superfluous
+            test: false    # Running tests on all distros is superfluous
 
           - distro: Debian
             version: 13
@@ -126,7 +126,7 @@ jobs:
             version: 43
 
             package: RPM
-            test: skip    # Running tests on all distros is superfluous
+            test: false    # Running tests on all distros is superfluous
 
           - distro: Fedora
             version: 44
@@ -137,7 +137,7 @@ jobs:
             version: 24.04
 
             package: DEB
-            test: skip    # Running tests on all distros is superfluous
+            test: false    # Running tests on all distros is superfluous
 
           - distro: Ubuntu
             version: 26.04
@@ -175,7 +175,7 @@ jobs:
         run: source .ci/docker.sh --build
 
       - name: "Build debug and test"
-        if: matrix.test != 'skip'
+        if: matrix.test != false
         shell: bash
         run: |
           source .ci/docker.sh
@@ -184,7 +184,7 @@ jobs:
 
       - name: "Build release package"
         id: build
-        if: matrix.package != 'skip'
+        if: matrix.package != false
         shell: bash
         env:
           SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
@@ -222,7 +222,7 @@ jobs:
 
       - name: "Upload artifact"
         id: upload_artifact
-        if: matrix.package != 'skip'
+        if: matrix.package != false
         uses: actions/upload-artifact@v7
         with:
           archive: false
@@ -231,7 +231,7 @@ jobs:
 
       - name: "Upload to release"
         id: upload_release
-        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
+        if: matrix.package != false && needs.configure.outputs.tag != null
         shell: bash
         env:
           ASSET_NAME: ${{ steps.build.outputs.fullname }}

From 25ae0634340beaa146f675ecd4434c51dcb0eaf6 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Mon, 29 Jun 2026 12:31:53 +0200
Subject: [PATCH 08/30] rename

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

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 9c65e345b..3178191f7 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -1,4 +1,4 @@
-name: Build Docker Image
+name: Build Docker
 
 permissions:
   contents: read

From fb74e8fd97c1e9c5b6434eafef01dcbf10f46775 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Mon, 29 Jun 2026 13:12:27 +0200
Subject: [PATCH 09/30] whitespace

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

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 3178191f7..45d88ae6b 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -28,7 +28,7 @@ jobs:
     name: amd64 & arm64
     if: ${{ github.repository_owner == 'Cockatrice' }}
     runs-on: ubuntu-latest
-  
+
     steps:
       - name: "Checkout"
         uses: actions/checkout@v7

From b768c27c4c6e7d82a539f5bea0684881d6be1f19 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Mon, 29 Jun 2026 13:32:03 +0200
Subject: [PATCH 10/30] Harmonize beta and assign true/false value, Capitalize
 print messages

---
 .ci/prep_release.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.ci/prep_release.sh b/.ci/prep_release.sh
index 8e830bb23..626f4c968 100755
--- a/.ci/prep_release.sh
+++ b/.ci/prep_release.sh
@@ -7,7 +7,7 @@
 # adds output to GITHUB_OUTPUT
 template_path=".ci/release_template.md"
 body_path="/tmp/release.md"
-beta_regex='beta'
+beta_regex='-beta'
 name_regex='set\(GIT_TAG_RELEASENAME "([[:print:]]+)")'
 whitespace='^\s*$'
 
@@ -23,28 +23,29 @@ fi
 
 # create title
 if [[ $TAG =~ $beta_regex ]]; then
-  echo "is_beta=true" >>"$GITHUB_OUTPUT"
+  beta=true
+  echo "beta=$beta" >>"$GITHUB_OUTPUT"
   title="$TAG"
-  echo "creating beta release '$title'"
+  echo "Creating beta release '$title'"
 elif [[ ! $(cat CMakeLists.txt) =~ $name_regex ]]; then
-  echo "::error file=$0::could not find releasename in CMakeLists.txt"
+  echo "::error file=$0::Could not find releasename in CMakeLists.txt"
   exit 1
 else
-  echo "is_beta=false" >>"$GITHUB_OUTPUT"
+  beta=false
+  echo "beta=$beta" >>"$GITHUB_OUTPUT"
   name="${BASH_REMATCH[1]}"
   version="${TAG##*-}"
   title="Cockatrice $version: $name"
-  no_beta=true
   echo "friendly_name=$name" >>"$GITHUB_OUTPUT"
-  echo "creating full release '$title'"
+  echo "Creating full release '$title'"
 fi
 echo "title=$title" >>"$GITHUB_OUTPUT"
 
 # add release notes template
-if [[ $no_beta ]]; then
+if [[ $beta == "false" ]]; then
   body="$(cat "$template_path")"
   if [[ ! $body ]]; then
-    echo "::warning file=$0::could not find release template"
+    echo "::warning file=$0::Could not find release template"
   fi
   body="${body//--REPLACE-WITH-RELEASE-TITLE--/$title}"
 else
@@ -64,13 +65,13 @@ before="${all_tags%%
 "$TAG"*}" # strip line with current tag an all lines after it
 # note the extra newlines are needed to always have a last line
 if [[ $all_tags == "$before" ]]; then
-  echo "::warning file=$0::could not find current tag"
+  echo "::warning file=$0::Could not find current tag"
 else
   while
     previous="${before##*
 }" # get the last line
     # skip this tag if this is a full release and it's a beta or if empty
-    [[ $no_beta && $previous =~ $beta_regex || ! $previous ]]
+    [[ $beta == "false" && $previous =~ $beta_regex || ! $previous ]]
   do
     beta_list+=" $previous" # add to list of skipped betas
     next_before="${before%
@@ -85,7 +86,7 @@ else
     if generated_list="$(git log "$previous..$TAG" --pretty="- %s")"; then
       count="$(git rev-list --count "$previous..$TAG")"
       [[ $previous =~ $beta_regex ]] && previousreleasetype="beta release" || previousreleasetype="full release"
-      echo "adding list of commits to release notes:"
+      echo "Adding list of commits to release notes:"
       echo "'$previous' to '$TAG' ($count commits)"
       # --> is the markdown comment escape sequence, emojis are way better
       generated_list="${generated_list//-->/→}"
@@ -98,15 +99,15 @@ else
       if [[ $beta_list =~ $whitespace ]]; then
         beta_list="-n there are no betas to delete!"
       else
-        echo "the following betas should be deleted after publishing:"
+        echo "The following betas should be deleted after publishing:"
         echo "$beta_list"
       fi
       body="${body//--REPLACE-WITH-BETA-LIST--/$beta_list}"
     else
-      echo "::warning file=$0::failed to produce git log"
+      echo "::warning file=$0::Failed to produce git log"
     fi
   else
-    echo "::warning file=$0::could not find previous tag"
+    echo "::warning file=$0::Could not find previous tag"
   fi
 fi
 

From 05621b0c4478e16ca0d3470bc3fe050284e34250 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Mon, 29 Jun 2026 13:34:25 +0200
Subject: [PATCH 11/30] match new script logic

---
 .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 91f588870..f41e6710c 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -83,7 +83,7 @@ jobs:
           TARGET: ${{ steps.configure.outputs.sha }}
           RELEASE_NAME: ${{ steps.prepare.outputs.title }}
           BODY_PATH: ${{ steps.prepare.outputs.body_path }}
-          PRERELEASE: ${{ steps.prepare.outputs.is_beta }}
+          PRERELEASE: ${{ steps.prepare.outputs.beta }}
         run: |
           args=()
           [[ "$PRERELEASE" == "true" ]] && args+=(--prerelease)

From d7220bb9ad52bacfbdf22e839375379d323fb7b5 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Mon, 29 Jun 2026 19:42:51 +0200
Subject: [PATCH 12/30] linux updates

---
 .github/workflows/desktop-build.yml | 32 +++++++++++++----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index f41e6710c..91cd91bdf 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -78,12 +78,12 @@ jobs:
         id: create_release
         shell: bash
         env:
+          BODY_PATH: ${{ steps.prepare.outputs.body_path }}
           GH_TOKEN: ${{ github.token }}
+          PRERELEASE: ${{ steps.prepare.outputs.beta }}
+          RELEASE_NAME: ${{ steps.prepare.outputs.title }}
           TAG_NAME: ${{ steps.configure.outputs.tag }}
           TARGET: ${{ steps.configure.outputs.sha }}
-          RELEASE_NAME: ${{ steps.prepare.outputs.title }}
-          BODY_PATH: ${{ steps.prepare.outputs.body_path }}
-          PRERELEASE: ${{ steps.prepare.outputs.beta }}
         run: |
           args=()
           [[ "$PRERELEASE" == "true" ]] && args+=(--prerelease)
@@ -102,47 +102,46 @@ jobs:
           - distro: Arch
 
             allow-failure: true
-            package: false    # We are packaged in Arch already
+            test: true    # run debug build and tests
 
           - distro: Servatrice_Debian
             version: 12
 
             package: DEB
             server_only: true
-            test: false
 
           - distro: Debian
             version: 12
 
             package: DEB
-            test: false    # Running tests on all distros is superfluous
 
           - distro: Debian
             version: 13
 
             package: DEB
+            test: true    # run debug build and tests on newest distro version
 
           - distro: Fedora
             version: 43
 
             package: RPM
-            test: false    # Running tests on all distros is superfluous
 
           - distro: Fedora
             version: 44
 
             package: RPM
+            test: true    # run debug build and tests on newest distro version
 
           - distro: Ubuntu
             version: 24.04
 
             package: DEB
-            test: false    # Running tests on all distros is superfluous
 
           - distro: Ubuntu
             version: 26.04
 
             package: DEB
+            test: true    # run debug build and tests on newest distro version
 
     name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
@@ -150,7 +149,7 @@ jobs:
     continue-on-error: ${{ matrix.allow-failure == true }}
     timeout-minutes: 70
     env:
-      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
+      CACHE_DIR: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
       CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CMAKE_GENERATOR: 'Ninja'
@@ -167,7 +166,7 @@ jobs:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
           key: ccache-${{ matrix.distro }}${{ matrix.version }}-${{ env.BRANCH_NAME }}
-          path: ${{ env.CACHE }}
+          path: ${{ env.CACHE_DIR }}
           restore-keys: ccache-${{ matrix.distro }}${{ matrix.version }}-
 
       - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
@@ -175,7 +174,7 @@ jobs:
         run: source .ci/docker.sh --build
 
       - name: "Build debug and test"
-        if: matrix.test != false
+        if: matrix.test == true
         shell: bash
         run: |
           source .ci/docker.sh
@@ -184,12 +183,12 @@ jobs:
 
       - name: "Build release package"
         id: build
-        if: matrix.package != false
+        if: ${{ matrix.package != '' }}
         shell: bash
         env:
-          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
           PACKAGE: '${{ matrix.package }}'
           SERVER_ONLY: '${{ matrix.server_only }}'
+          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
         run: |
           source .ci/docker.sh
           args=()
@@ -218,7 +217,7 @@ jobs:
         uses: actions/cache/save@v6
         with:
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
-          path: ${{ env.CACHE }}
+          path: ${{ env.CACHE_DIR }}
 
       - name: "Upload artifact"
         id: upload_artifact
@@ -265,7 +264,6 @@ jobs:
             target: 13
             runner: macos-15-intel
 
-            ccache_eviction_age: 7d
             cmake_generator: Ninja
             make_package: true
             override_target: 13
@@ -282,7 +280,6 @@ jobs:
             target: 14
             runner: macos-14
 
-            ccache_eviction_age: 7d
             cmake_generator: Ninja
             make_package: true
             package_suffix: "-macOS14"
@@ -298,7 +295,6 @@ jobs:
             target: 15
             runner: macos-15
 
-            ccache_eviction_age: 7d
             cmake_generator: Ninja
             make_package: true
             package_suffix: "-macOS15"
@@ -314,7 +310,6 @@ jobs:
             target: 15
             runner: macos-15
 
-            ccache_eviction_age: 7d
             cmake_generator: Ninja
             qt_version: 6.11.0
             qt_arch: clang_64
@@ -343,6 +338,7 @@ jobs:
     timeout-minutes: 100
     env:
       CCACHE_DIR: ${{ github.workspace }}/.cache/
+      CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
 
     steps:

From 18b2b2c761045beeefb2ca0af5f2da00626b877f Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Tue, 30 Jun 2026 14:21:59 +0200
Subject: [PATCH 13/30] rename parameter + cleanup

---
 .github/workflows/desktop-build.yml | 43 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 91cd91bdf..a79dfece4 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -97,7 +97,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # The files in ".ci/$distro$version" correspond to the values given here
+        # The files in ".ci/$distro$distro_version" correspond to the values given here
         include:
           - distro: Arch
 
@@ -105,55 +105,55 @@ jobs:
             test: true    # run debug build and tests
 
           - distro: Servatrice_Debian
-            version: 12
+            distro_version: 12
 
             package: DEB
             server_only: true
 
           - distro: Debian
-            version: 12
+            distro_version: 12
 
             package: DEB
 
           - distro: Debian
-            version: 13
+            distro_version: 13
 
             package: DEB
             test: true    # run debug build and tests on newest distro version
 
           - distro: Fedora
-            version: 43
+            distro_version: 43
 
             package: RPM
 
           - distro: Fedora
-            version: 44
+            distro_version: 44
 
             package: RPM
             test: true    # run debug build and tests on newest distro version
 
           - distro: Ubuntu
-            version: 24.04
+            distro_version: 24.04
 
             package: DEB
 
           - distro: Ubuntu
-            version: 26.04
+            distro_version: 26.04
 
             package: DEB
             test: true    # run debug build and tests on newest distro version
 
-    name: ${{ matrix.distro }} ${{ matrix.version }}
+    name: ${{ matrix.distro }} ${{ matrix.distro_version }}
     needs: configure
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.allow-failure == true }}
     timeout-minutes: 70
     env:
-      CACHE_DIR: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
+      CACHE_DIR: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.distro_version }}    # directory for caching docker image and ccache
       CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CMAKE_GENERATOR: 'Ninja'
-      NAME: ${{ matrix.distro }}${{ matrix.version }}
+      NAME: ${{ matrix.distro }}${{ matrix.distro_version }}
 
     steps:
       - name: "Checkout"
@@ -165,11 +165,11 @@ jobs:
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          key: ccache-${{ matrix.distro }}${{ matrix.version }}-${{ env.BRANCH_NAME }}
+          key: ccache-${{ matrix.distro }}${{ matrix.distro_version }}-${{ env.BRANCH_NAME }}
           path: ${{ env.CACHE_DIR }}
-          restore-keys: ccache-${{ matrix.distro }}${{ matrix.version }}-
+          restore-keys: ccache-${{ matrix.distro }}${{ matrix.distro_version }}-
 
-      - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
+      - name: "Build ${{ matrix.distro }} ${{ matrix.distro_version }} Docker image"
         shell: bash
         run: source .ci/docker.sh --build
 
@@ -188,7 +188,7 @@ jobs:
         env:
           PACKAGE: '${{ matrix.package }}'
           SERVER_ONLY: '${{ matrix.server_only }}'
-          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
+          SUFFIX: '-${{ matrix.distro }}${{ matrix.distro_version }}'
         run: |
           source .ci/docker.sh
           args=()
@@ -261,7 +261,7 @@ jobs:
       matrix:
         include:
           - os: macOS
-            target: 13
+            os_target_version: 13
             runner: macos-15-intel
 
             cmake_generator: Ninja
@@ -277,7 +277,7 @@ jobs:
             xcode: "16.4"
 
           - os: macOS
-            target: 14
+            os_target_version: 14
             runner: macos-14
 
             cmake_generator: Ninja
@@ -292,7 +292,7 @@ jobs:
             xcode: "15.4"
 
           - os: macOS
-            target: 15
+            os_target_version: 15
             runner: macos-15
 
             cmake_generator: Ninja
@@ -307,7 +307,7 @@ jobs:
             xcode: "16.4"
 
           - os: macOS
-            target: 15
+            os_target_version: 15
             runner: macos-15
 
             cmake_generator: Ninja
@@ -320,7 +320,7 @@ jobs:
             xcode: "16.4"
 
           - os: Windows
-            target: 10
+            os_target_version: 10
             runner: windows-2025
 
             cmake_generator: "Visual Studio 18 2026"
@@ -332,7 +332,7 @@ jobs:
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             type: Release
 
-    name: ${{ matrix.os }} ${{ matrix.target }}${{ case(matrix.soc == 'Intel', ' Intel', '') }}${{ case(matrix.type == 'Debug', ' Debug', '') }}
+    name: ${{ matrix.os }} ${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', ' Intel', '') }}${{ case(matrix.type == 'Debug', ' Debug', '') }}
     needs: configure
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 100
@@ -439,7 +439,6 @@ jobs:
         shell: bash
         env:
           BUILDTYPE: '${{ matrix.type }}'
-          CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
           CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
           CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
           DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'

From 56a64d2ddd2c04e3a30aec8dda3f219354bc5abd Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Thu, 2 Jul 2026 18:14:33 +0200
Subject: [PATCH 14/30] reorder

[ 0 ] Get source
[ 1 ] Install dependencies
[ 2 ] Setup and prepare compilation
[ 3 ] Build
[ 4 ] Cleanup
[ 5 ] Deploy
---
 .github/workflows/desktop-build.yml | 44 ++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index a79dfece4..ef675fa9a 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -347,28 +347,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: "[Windows] Add msbuild to PATH"
-        if: matrix.os == 'Windows'
-        id: add-msbuild
-        uses: microsoft/setup-msbuild@v3
-        with:
-          msbuild-architecture: x64
-
-      - name: "[macOS] Setup ccache"
+      - name: "[macOS] Install ccache"
         if: matrix.os == 'macOS' && matrix.use_ccache == true
         run: brew install ccache
 
-      - name: "[macOS] Restore compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == true
-        id: ccache_restore
-        uses: actions/cache/restore@v6
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-        with:
-          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
-          path: ${{ env.CCACHE_DIR }}
-          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
-
       - name: "Install aqtinstall"
         run: pipx install aqtinstall
 
@@ -411,6 +393,11 @@ jobs:
           key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
           path: ${{ github.workspace }}/Qt
 
+      - name: "[Windows] Install NSIS"
+        if: matrix.os == 'Windows'
+        shell: bash
+        run: choco install nsis
+
       - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
         if: matrix.os == 'Windows'
         uses: jurplel/install-qt-action@v4
@@ -422,10 +409,12 @@ jobs:
           modules: ${{ matrix.qt_modules }}
           version: ${{ steps.resolve_qt_version.outputs.version }}
 
-      - name: "[Windows] Install NSIS"
+      - name: "[Windows] Setup MSBuild"
         if: matrix.os == 'Windows'
-        shell: bash
-        run: choco install nsis
+        id: add-msbuild
+        uses: microsoft/setup-msbuild@v3
+        with:
+          msbuild-architecture: x64
 
       - name: "Setup vcpkg cache"
         id: vcpkg-cache
@@ -433,6 +422,17 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "[macOS] Restore compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == true
+        id: ccache_restore
+        uses: actions/cache/restore@v6
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+        with:
+          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
+          path: ${{ env.CCACHE_DIR }}
+          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
+
       # Uses environment variables, see compile.sh for more details
       - name: "Build Cockatrice"
         id: build

From d90d01fb9a43c36ecd3c1e72d6ab006c91262386 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 16:42:56 +0200
Subject: [PATCH 15/30] var rename + cleanup quotes

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index ef675fa9a..378539f3b 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -152,7 +152,7 @@ jobs:
       CACHE_DIR: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.distro_version }}    # directory for caching docker image and ccache
       CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-      CMAKE_GENERATOR: 'Ninja'
+      CMAKE_GENERATOR: Ninja
       NAME: ${{ matrix.distro }}${{ matrix.distro_version }}
 
     steps:
@@ -186,17 +186,17 @@ jobs:
         if: ${{ matrix.package != '' }}
         shell: bash
         env:
-          PACKAGE: '${{ matrix.package }}'
-          SERVER_ONLY: '${{ matrix.server_only }}'
-          SUFFIX: '-${{ matrix.distro }}${{ matrix.distro_version }}'
+          PACKAGE: ${{ matrix.package }}
+          PACKAGE_SUFFIX: -${{ matrix.distro }}${{ matrix.distro_version }}
+          SERVER_ONLY: ${{ matrix.server_only }}
         run: |
           source .ci/docker.sh
           args=()
-          [[ "$SERVER_ONLY" == "true" ]] && args+=(--no-client)
           [[ "$GITHUB_REF" == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
+          [[ "$SERVER_ONLY" == "true" ]] && args+=(--no-client)
           args+=(--ccache "$CCACHE_SIZE")
           args+=(--cmake-generator "$CMAKE_GENERATOR")
-          args+=(--suffix "$SUFFIX")
+          args+=(--suffix "$PACKAGE_SUFFIX")
 
           RUN --server --release --package "$PACKAGE" "${args[@]}"
 
@@ -438,7 +438,7 @@ jobs:
         id: build
         shell: bash
         env:
-          BUILDTYPE: '${{ matrix.type }}'
+          BUILDTYPE: ${{ matrix.type }}
           CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
           CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
           DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
@@ -446,8 +446,8 @@ jobs:
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-          MAKE_PACKAGE: '${{ matrix.make_package }}'
-          PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
+          MAKE_PACKAGE: ${{ matrix.make_package }}
+          PACKAGE_SUFFIX: ${{ matrix.package_suffix }}
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
           USE_CCACHE: ${{ matrix.use_ccache }}
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'

From ba6ae0999b91e4a21cd6d98ea4b0d7ed309f4471 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 17:19:44 +0200
Subject: [PATCH 16/30] rename "name" var

---
 .ci/docker.sh                       | 12 ++++++------
 .github/workflows/desktop-build.yml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/docker.sh b/.ci/docker.sh
index 46112daaa..94bb43bf2 100644
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -7,13 +7,13 @@
 # usage: source <script> <name> [--get] [--build] [--save] [--interactive] [--set-cache <location>]
 # <name> sets the name of the docker image, these correspond to directories in .ci
 # --get loads the image from a previously saved image cache, will build if no image is found
-# --build builds the image from the Dockerfile in .ci/$NAME
+# --build builds the image from the Dockerfile in .ci/$BUILD_REFERENCE
 # --save stores the image, if an image was loaded it will not be stored
 # --interactive immediately starts the image interactively for debugging
 # --set-cache <location> sets the location to cache the image or for ccache
 #
 # requires: docker
-# uses env: NAME CACHE BUILD GET SAVE INTERACTIVE
+# uses env: BUILD_REFERENCE CACHE BUILD GET SAVE INTERACTIVE
 # (correspond to args: <name> --set-cache <cache> --build --get --save --interactive)
 # sets env: RUN CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
 # exitcode: 1 for failure, 2 for missing dockerfile, 3 for invalid arguments
@@ -69,21 +69,21 @@ while [[ $# != 0 ]]; do
         echo "unrecognized option: $1"
         return 3
       fi
-      NAME="$1"
+      BUILD_REFERENCE="$1"
       shift
       ;;
   esac
 done
 
 # Setup
-if ! [[ $NAME ]]; then
+if ! [[ $BUILD_REFERENCE ]]; then
   echo "no build name given" >&2
   return 3
 fi
 
-export IMAGE_NAME="${project_name,,}_${NAME,,}" # lower case
+export IMAGE_NAME="${project_name,,}_${BUILD_REFERENCE,,}" # lower case
 
-docker_dir=".ci/$NAME"
+docker_dir=".ci/$BUILD_REFERENCE"
 if ! [[ -r $docker_dir/Dockerfile ]]; then
   echo "could not find Dockerfile in $docker_dir" >&2
   return 2 # even if the image is cached, we do not want to run if there is no way to build this image
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 378539f3b..719184321 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -97,7 +97,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # The files in ".ci/$distro$distro_version" correspond to the values given here
+        # The files in ".ci/$BUILD_REFERENCE" correspond to the values given here
         include:
           - distro: Arch
 
@@ -153,7 +153,7 @@ jobs:
       CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CMAKE_GENERATOR: Ninja
-      NAME: ${{ matrix.distro }}${{ matrix.distro_version }}
+      BUILD_REFERENCE: ${{ matrix.distro }}${{ matrix.distro_version }}
 
     steps:
       - name: "Checkout"

From dc08e963e64356c41658465a1cef4aa8bea1ce0e Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 17:36:09 +0200
Subject: [PATCH 17/30] fix packaging condition with new logic

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 719184321..ca909c357 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -183,7 +183,7 @@ jobs:
 
       - name: "Build release package"
         id: build
-        if: ${{ matrix.package != '' }}
+        if: matrix.package
         shell: bash
         env:
           PACKAGE: ${{ matrix.package }}
@@ -221,7 +221,7 @@ jobs:
 
       - name: "Upload artifact"
         id: upload_artifact
-        if: matrix.package != false
+        if: matrix.package
         uses: actions/upload-artifact@v7
         with:
           archive: false
@@ -230,7 +230,7 @@ jobs:
 
       - name: "Upload to release"
         id: upload_release
-        if: matrix.package != false && needs.configure.outputs.tag != null
+        if: matrix.package && needs.configure.outputs.tag != null
         shell: bash
         env:
           ASSET_NAME: ${{ steps.build.outputs.fullname }}
@@ -474,7 +474,7 @@ jobs:
           path: ${{ env.CCACHE_DIR }}
 
       - name: "[macOS] Sign app bundle"
-        if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
+        if: matrix.os == 'macOS' && matrix.make_package == true && needs.configure.outputs.tag != null
         id: sign_macos
         env:
           BUILD_PATH: ${{ steps.build.outputs.path }}
@@ -521,7 +521,7 @@ jobs:
           fi
 
       - name: "Upload artifact"
-        if: matrix.make_package
+        if: matrix.make_package == true
         id: upload_artifact
         uses: actions/upload-artifact@v7
         with:
@@ -541,7 +541,7 @@ jobs:
             build/servatrice/Release/*.pdb
 
       - name: "Upload to release"
-        if: needs.configure.outputs.tag != null && matrix.make_package == true
+        if: matrix.make_package == true && needs.configure.outputs.tag != null
         id: upload_release
         shell: bash
         env:

From 62dc1c29f52a5a13f15f4730df868cc65c06cda2 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 18:36:34 +0200
Subject: [PATCH 18/30] construct package_suffix var from existing values and
 adjust updater

---
 .github/workflows/desktop-build.yml                         | 6 +-----
 .../src/client/network/update/client/release_channel.cpp    | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index ca909c357..7d5278241 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -267,7 +267,6 @@ jobs:
             cmake_generator: Ninja
             make_package: true
             override_target: 13
-            package_suffix: "-macOS13_Intel"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -282,7 +281,6 @@ jobs:
 
             cmake_generator: Ninja
             make_package: true
-            package_suffix: "-macOS14"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -297,7 +295,6 @@ jobs:
 
             cmake_generator: Ninja
             make_package: true
-            package_suffix: "-macOS15"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -326,7 +323,6 @@ jobs:
             cmake_generator: "Visual Studio 18 2026"
             cmake_generator_platform: x64
             make_package: true
-            package_suffix: "-Win10"
             qt_version: 6.11.0
             qt_arch: win64_msvc2022_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -447,7 +443,7 @@ jobs:
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
           MAKE_PACKAGE: ${{ matrix.make_package }}
-          PACKAGE_SUFFIX: ${{ matrix.package_suffix }}
+          PACKAGE_SUFFIX: '-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '_Intel', '') }}'
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
           USE_CCACHE: ${{ matrix.use_ccache }}
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp
index 260167bc8..463a4164c 100644
--- a/cockatrice/src/client/network/update/client/release_channel.cpp
+++ b/cockatrice/src/client/network/update/client/release_channel.cpp
@@ -79,9 +79,9 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
 #elif Q_PROCESSOR_WORDSIZE == 8
     const QString &version = QSysInfo::productVersion();
     if (version.startsWith("7") || version.startsWith("8")) {
-        return fileName.contains("Win7");
+        return fileName.contains("Win7") || fileName.contains("Windows7");
     } else {
-        return fileName.contains("Win10");
+        return fileName.contains("Win10") || fileName.contains("Windows10");
     }
 #else
     Q_UNUSED(fileName);

From c3ad667969a97fe788108279bbdf48fd5ad7cb1e Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 19:27:27 +0200
Subject: [PATCH 19/30] harmonize and simplify more if conditions

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 7d5278241..e26043346 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -60,21 +60,21 @@ jobs:
           echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT"
 
       - name: "Checkout"
-        if: steps.configure.outputs.tag != null
+        if: steps.configure.outputs.tag
         uses: actions/checkout@v7
         with:
           fetch-depth: 0    # fetch all history for all branches and tags
 
       - name: "Prepare release parameters"
         id: prepare
-        if: steps.configure.outputs.tag != null
+        if: steps.configure.outputs.tag
         shell: bash
         env:
           TAG: ${{ steps.configure.outputs.tag }}
         run: .ci/prep_release.sh
 
       - name: "Create release"
-        if: steps.configure.outputs.tag != null
+        if: steps.configure.outputs.tag
         id: create_release
         shell: bash
         env:
@@ -202,7 +202,7 @@ jobs:
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "Delete remote compiler cache (ccache)"
-        if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
+        if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit == 'true'
         continue-on-error: true
         env:
           CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -230,7 +230,7 @@ jobs:
 
       - name: "Upload to release"
         id: upload_release
-        if: matrix.package && needs.configure.outputs.tag != null
+        if: matrix.package && needs.configure.outputs.tag
         shell: bash
         env:
           ASSET_NAME: ${{ steps.build.outputs.fullname }}
@@ -452,7 +452,7 @@ jobs:
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == true && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
+        if: matrix.os == 'macOS' && matrix.use_ccache == true && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit == 'true'
         continue-on-error: true
         env:
           CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -470,7 +470,7 @@ jobs:
           path: ${{ env.CCACHE_DIR }}
 
       - name: "[macOS] Sign app bundle"
-        if: matrix.os == 'macOS' && matrix.make_package == true && needs.configure.outputs.tag != null
+        if: matrix.os == 'macOS' && matrix.make_package == true && needs.configure.outputs.tag
         id: sign_macos
         env:
           BUILD_PATH: ${{ steps.build.outputs.path }}
@@ -537,7 +537,7 @@ jobs:
             build/servatrice/Release/*.pdb
 
       - name: "Upload to release"
-        if: matrix.make_package == true && needs.configure.outputs.tag != null
+        if: matrix.make_package == true && needs.configure.outputs.tag
         id: upload_release
         shell: bash
         env:

From 5c53481cd8e8ea4baec4cdb2963aef6da2c9be97 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 19:46:28 +0200
Subject: [PATCH 20/30] double quotes for envs

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index e26043346..22f4c0a73 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -187,7 +187,7 @@ jobs:
         shell: bash
         env:
           PACKAGE: ${{ matrix.package }}
-          PACKAGE_SUFFIX: -${{ matrix.distro }}${{ matrix.distro_version }}
+          PACKAGE_SUFFIX: "-${{ matrix.distro }}${{ matrix.distro_version }}"
           SERVER_ONLY: ${{ matrix.server_only }}
         run: |
           source .ci/docker.sh
@@ -437,16 +437,16 @@ jobs:
           BUILDTYPE: ${{ matrix.type }}
           CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
           CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
-          DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
+          DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
           MAKE_PACKAGE: ${{ matrix.make_package }}
-          PACKAGE_SUFFIX: '-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '_Intel', '') }}'
+          PACKAGE_SUFFIX: "-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '_Intel', '') }}"
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
           USE_CCACHE: ${{ matrix.use_ccache }}
-          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
+          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite"
           VCPKG_DISABLE_METRICS: true
         run: .ci/compile.sh --server --test --vcpkg
 

From de75df51282684ae703e7d531cc78d9e43e0d7ff Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 22:26:46 +0200
Subject: [PATCH 21/30] more explicit check

---
 .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 22f4c0a73..8ed3e8583 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -369,7 +369,7 @@ jobs:
       # Using jurplel/install-qt-action to install Qt without using brew
       # Qt build using vcpkg either just fails or takes too long to build
       - name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == 'false'
         uses: jurplel/install-qt-action@v4
         with:
           arch: ${{ matrix.qt_arch }}
@@ -379,11 +379,11 @@ jobs:
           version: ${{ steps.resolve_qt_version.outputs.version }}
 
       - name: "[macOS] Create thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == 'false'
         run: .ci/thin_macos_qtlib.sh
 
       - name: "[macOS] Cache thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == 'false'
         uses: actions/cache/save@v6
         with:
           key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}

From 1695e14b26aa6d1e807c227f61cbd65a3a2de082 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 22:27:01 +0200
Subject: [PATCH 22/30] uniform github token usage

---
 .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 8ed3e8583..1c9e81182 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -416,7 +416,7 @@ jobs:
         id: vcpkg-cache
         uses: TAServers/vcpkg-cache@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ github.token }}
 
       - name: "[macOS] Restore compiler cache (ccache)"
         if: matrix.os == 'macOS' && matrix.use_ccache == true

From 45080abd46b550b2800db7796240005b126281a3 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 3 Jul 2026 22:42:26 +0200
Subject: [PATCH 23/30] remove quotes

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 1c9e81182..3bdd19e66 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -149,11 +149,11 @@ jobs:
     continue-on-error: ${{ matrix.allow-failure == true }}
     timeout-minutes: 70
     env:
+      BUILD_REFERENCE: ${{ matrix.distro }}${{ matrix.distro_version }}
       CACHE_DIR: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.distro_version }}    # directory for caching docker image and ccache
       CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CMAKE_GENERATOR: Ninja
-      BUILD_REFERENCE: ${{ matrix.distro }}${{ matrix.distro_version }}
 
     steps:
       - name: "Checkout"
@@ -273,7 +273,7 @@ jobs:
             soc: Intel
             type: Release
             use_ccache: true
-            xcode: "16.4"
+            xcode: 16.4
 
           - os: macOS
             os_target_version: 14
@@ -287,7 +287,7 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: true
-            xcode: "15.4"
+            xcode: 15.4
 
           - os: macOS
             os_target_version: 15
@@ -301,7 +301,7 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: true
-            xcode: "16.4"
+            xcode: 16.4
 
           - os: macOS
             os_target_version: 15
@@ -314,13 +314,13 @@ jobs:
             soc: Apple
             type: Debug
             use_ccache: true
-            xcode: "16.4"
+            xcode: 16.4
 
           - os: Windows
             os_target_version: 10
             runner: windows-2025
 
-            cmake_generator: "Visual Studio 18 2026"
+            cmake_generator: Visual Studio 18 2026
             cmake_generator_platform: x64
             make_package: true
             qt_version: 6.11.0

From fa004cc4982be9a6760d270d9fdda712286e9baf Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 4 Jul 2026 23:23:28 +0200
Subject: [PATCH 24/30] use existing target value

https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_DEPLOYMENT_TARGET.html
---
 .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 3bdd19e66..ba4801ca1 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -266,7 +266,6 @@ jobs:
 
             cmake_generator: Ninja
             make_package: true
-            override_target: 13
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -444,7 +443,7 @@ jobs:
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
           MAKE_PACKAGE: ${{ matrix.make_package }}
           PACKAGE_SUFFIX: "-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '_Intel', '') }}"
-          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
+          TARGET_MACOS_VERSION: ${{ matrix.os_target_version }}
           USE_CCACHE: ${{ matrix.use_ccache }}
           VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite"
           VCPKG_DISABLE_METRICS: true

From fc1d1b4f5d1362efe42265e02fd3307431fdc2e7 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 11:59:32 +0200
Subject: [PATCH 25/30] fix cache-hit check

Values are either
 - true for exact cache hit
 - false for partial cache hit (restore-key not defined + wanted in this step)
 - empty for no cache hit
---
 .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 ba4801ca1..80c5308c5 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -368,7 +368,7 @@ jobs:
       # Using jurplel/install-qt-action to install Qt without using brew
       # Qt build using vcpkg either just fails or takes too long to build
       - name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == 'false'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == ''
         uses: jurplel/install-qt-action@v4
         with:
           arch: ${{ matrix.qt_arch }}
@@ -378,11 +378,11 @@ jobs:
           version: ${{ steps.resolve_qt_version.outputs.version }}
 
       - name: "[macOS] Create thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == 'false'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == ''
         run: .ci/thin_macos_qtlib.sh
 
       - name: "[macOS] Cache thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == 'false'
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == ''
         uses: actions/cache/save@v6
         with:
           key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}

From 32e73da8c0fd1e9dda6c13d33cca321dd3662e7b Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 12:59:00 +0200
Subject: [PATCH 26/30] docs, qt caches

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 80c5308c5..598e54015 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -42,7 +42,7 @@ concurrency:
 jobs:
   configure:
     name: Configure
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
     outputs:
       tag: ${{ steps.configure.outputs.tag }}
       sha: ${{ steps.configure.outputs.sha }}
@@ -145,7 +145,7 @@ jobs:
 
     name: ${{ matrix.distro }} ${{ matrix.distro_version }}
     needs: configure
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest    # https://github.com/actions/runner-images/tree/main#available-images
     continue-on-error: ${{ matrix.allow-failure == true }}
     timeout-minutes: 70
     env:
@@ -262,7 +262,7 @@ jobs:
         include:
           - os: macOS
             os_target_version: 13
-            runner: macos-15-intel
+            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
 
             cmake_generator: Ninja
             make_package: true
@@ -272,11 +272,11 @@ jobs:
             soc: Intel
             type: Release
             use_ccache: true
-            xcode: 16.4
+            xcode: 26.3
 
           - os: macOS
             os_target_version: 14
-            runner: macos-14
+            runner: macos-14    # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
 
             cmake_generator: Ninja
             make_package: true
@@ -286,11 +286,11 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: true
-            xcode: 15.4
+            xcode: 16.2
 
           - os: macOS
             os_target_version: 15
-            runner: macos-15
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
 
             cmake_generator: Ninja
             make_package: true
@@ -300,11 +300,11 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: true
-            xcode: 16.4
+            xcode: 26.3
 
           - os: macOS
             os_target_version: 15
-            runner: macos-15
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
 
             cmake_generator: Ninja
             qt_version: 6.11.0
@@ -313,11 +313,11 @@ jobs:
             soc: Apple
             type: Debug
             use_ccache: true
-            xcode: 16.4
+            xcode: 26.3
 
           - os: Windows
             os_target_version: 10
-            runner: windows-2025
+            runner: windows-2025    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md
 
             cmake_generator: Visual Studio 18 2026
             cmake_generator_platform: x64
@@ -362,7 +362,7 @@ jobs:
         id: restore_qt
         uses: actions/cache/restore@v6
         with:
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
+          key: thin-Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS${{ case(matrix.soc == 'Intel', '-Intel', '') }}
           path: ${{ github.workspace }}/Qt
 
       # Using jurplel/install-qt-action to install Qt without using brew
@@ -385,7 +385,7 @@ jobs:
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == ''
         uses: actions/cache/save@v6
         with:
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
+          key: thin-Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS${{ case(matrix.soc == 'Intel', '-Intel', '') }}
           path: ${{ github.workspace }}/Qt
 
       - name: "[Windows] Install NSIS"
@@ -424,9 +424,9 @@ jobs:
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
+          key: ccache-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '-Intel', '') }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
           path: ${{ env.CCACHE_DIR }}
-          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
+          restore-keys: ccache-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '-Intel', '') }}-${{ matrix.type }}-
 
       # Uses environment variables, see compile.sh for more details
       - name: "Build Cockatrice"

From f976c8d46e9a171f74f5cbf467fab8ae3bf4fd16 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 13:37:47 +0200
Subject: [PATCH 27/30] Explicitly mark stable releases as latest

https://cli.github.com/manual/gh_release_create
---
 .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 598e54015..6b39e4371 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -87,6 +87,7 @@ jobs:
         run: |
           args=()
           [[ "$PRERELEASE" == "true" ]] && args+=(--prerelease)
+          [[ "$PRERELEASE" == "false" ]] && args+=(--latest)
 
           gh release create "$TAG_NAME" --verify-tag --draft "${args[@]}" \
             --target "$TARGET" \

From 7691f8e167aef5b73dc0ea4ef541c8e5809501db Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 14:43:41 +0200
Subject: [PATCH 28/30] 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 6b39e4371..9b38e8f7d 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -363,7 +363,7 @@ jobs:
         id: restore_qt
         uses: actions/cache/restore@v6
         with:
-          key: thin-Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS${{ case(matrix.soc == 'Intel', '-Intel', '') }}
+          key: Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS${{ case(matrix.soc == 'Intel', '-Intel', '') }}-thin
           path: ${{ github.workspace }}/Qt
 
       # Using jurplel/install-qt-action to install Qt without using brew
@@ -386,7 +386,7 @@ jobs:
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit == ''
         uses: actions/cache/save@v6
         with:
-          key: thin-Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS${{ case(matrix.soc == 'Intel', '-Intel', '') }}
+          key: Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS${{ case(matrix.soc == 'Intel', '-Intel', '') }}-thin
           path: ${{ github.workspace }}/Qt
 
       - name: "[Windows] Install NSIS"

From 808369e806b6b64b1e165e8098783074cf7fca3b Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 15:47:14 +0200
Subject: [PATCH 29/30] Update docker-release.yml

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

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 45d88ae6b..d91f92d7a 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -26,7 +26,7 @@ concurrency:
 jobs:
   docker:
     name: amd64 & arm64
-    if: ${{ github.repository_owner == 'Cockatrice' }}
+    if: github.repository_owner == 'Cockatrice'
     runs-on: ubuntu-latest
 
     steps:

From b467849e0184932b4373eabd39ba03718dcc9b23 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 19:36:13 +0200
Subject: [PATCH 30/30] correct links

---
 .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 9b38e8f7d..fae145a38 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -277,7 +277,7 @@ jobs:
 
           - os: macOS
             os_target_version: 14
-            runner: macos-14    # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
+            runner: macos-14    # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
 
             cmake_generator: Ninja
             make_package: true
@@ -291,7 +291,7 @@ jobs:
 
           - os: macOS
             os_target_version: 15
-            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
 
             cmake_generator: Ninja
             make_package: true
@@ -305,7 +305,7 @@ jobs:
 
           - os: macOS
             os_target_version: 15
-            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
 
             cmake_generator: Ninja
             qt_version: 6.11.0