From 919b9d92aca1d62812216f967d744517f1c74804 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Tue, 18 Aug 2026 21:50:12 +0200
Subject: [PATCH 1/2] Fix a bug with a symlink dir not resolving correctly.
 (#7148)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 format.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/format.sh b/format.sh
index 83dee9e28..3fa435be1 100755
--- a/format.sh
+++ b/format.sh
@@ -11,6 +11,7 @@ set -o pipefail
 # go to the project root directory, this file should be located in the project root directory
 olddir="$PWD"
 cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with special links etc.
+phys_root="$(pwd -P)"
 
 # defaults
 include=("cockatrice/src" \
@@ -168,14 +169,14 @@ EOM
         echo "error in parsing arguments of $0: $1 is an unrecognized option" >&2
         exit 2 # input error
       fi
-      if [[ ! $1 ]] || next_dir=$(cd "$olddir" && cd -- "$1" && pwd); then
+      if [[ ! $1 ]] || next_dir=$(cd "$olddir" && cd -- "$1" && pwd -P); then
         if ! [[ $set_include ]]; then
           include=() # remove default includes
           set_include=1
         fi
         if [[ $1 ]]; then
-          if [[ $next_dir != $PWD/* ]]; then
-            echo "error in parsing arguments of $0: $next_dir is not in $PWD" >&2
+          if [[ "$next_dir" != "$phys_root" && "$next_dir" != "$phys_root"/* ]]; then
+            echo "error in parsing arguments of $0: $next_dir is not in $phys_root" >&2
             exit 2 # input error
           fi
           include+=("$next_dir")

From 18b4ffefa80b084a6c899e12e09140393451d15a Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Thu, 20 Aug 2026 06:57:39 +0200
Subject: [PATCH 2/2] [CI] `macos-14` GHA runner is deprecated (#7127)

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 09fabfbc9..de2bc55c9 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 }}
@@ -146,7 +146,7 @@ jobs:
 
     name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest    # https://github.com/actions/runner-images
     continue-on-error: ${{ matrix.allow-failure == 'yes' }}
     timeout-minutes: 70
     env:
@@ -262,8 +262,8 @@ jobs:
       matrix:
         include:
           - os: macOS
-            target: 13
-            runner: macos-15-intel
+            target: 13    # EOL 2025-09-15
+            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -275,26 +275,27 @@ jobs:
             soc: Intel
             type: Release
             use_ccache: 1
-            xcode: "16.4"
+            xcode: "26.3"
 
           - os: macOS
-            target: 14
-            runner: macos-14
+            target: 14    # EOL 2026-??
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
             make_package: 1
+            override_target: 14
             package_suffix: "-macOS14"
             qt_version: 6.11.0
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "15.4"
+            xcode: "26.3"
 
           - os: macOS
             target: 15
-            runner: macos-15
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -305,11 +306,11 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "16.4"
+            xcode: "26.3"
 
           - os: macOS
             target: 15
-            runner: macos-15
+            runner: macos-15    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -318,11 +319,11 @@ jobs:
             soc: Apple
             type: Debug
             use_ccache: 1
-            xcode: "16.4"
+            xcode: "26.3"
 
           - os: Windows
             target: 10
-            runner: windows-2025
+            runner: windows-2025    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-VS2026-Readme.md
 
             cmake_generator: "Visual Studio 18 2026"
             cmake_generator_platform: x64