From 0366463ba75a8796d7b035c0ad34bfba93d51320 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 19:11:42 +0200
Subject: [PATCH 1/3] use macos26 across

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index a6b9d5340..ded99832d 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -263,7 +263,7 @@ jobs:
         include:
           - os: macOS
             target: 13
-            runner: macos-15-intel
+            runner: macos-26-intel
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -276,15 +276,34 @@ jobs:
             soc: Intel
             type: Release
             use_ccache: 1
-            xcode: "16.4"
+            xcode: "26.3"
 
           - os: macOS
-            target: 14
-            runner: macos-14
+            target: 13
+            runner: macos-26
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
             make_package: 1
+            override_target: 13
+            override_arch: arm64
+            package_suffix: "-macOS13_Intel2"
+            qt_version: 6.11.0
+            qt_arch: clang_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            soc: Intel
+            type: Release
+            use_ccache: 1
+            xcode: "26.3"
+
+          - os: macOS
+            target: 14
+            runner: macos-26
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            make_package: 1
+            override_target: 14
             package_suffix: "-macOS14"
             qt_version: 6.11.0
             qt_arch: clang_64
@@ -292,15 +311,16 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "15.4"
+            xcode: "26.3"
 
           - os: macOS
             target: 15
-            runner: macos-15
+            runner: macos-26
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
             make_package: 1
+            override_target: 15
             package_suffix: "-macOS15"
             qt_version: 6.11.0
             qt_arch: clang_64
@@ -308,21 +328,23 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "16.4"
+            xcode: "26.3"
 
           - os: macOS
-            target: 15
-            runner: macos-15
+            target: 26
+            runner: macos-26
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
+            make_package: 1
+            package_suffix: "-macOS26"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
-            type: Debug
+            type: Release
             use_ccache: 1
-            xcode: "16.4"
+            xcode: "26.3"
 
           - os: Windows
             target: 10
@@ -454,6 +476,7 @@ jobs:
           MAKE_PACKAGE: '${{ matrix.make_package }}'
           PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
+          CMAKE_OSX_ARCHITECTURES: ${{ matrix.override_arch }}
           USE_CCACHE: ${{ matrix.use_ccache }}
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
           VCPKG_DISABLE_METRICS: 1

From 03fb9e3210f052d0dd48a10f8ff3c03df1c0f3a4 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 19:13:35 +0200
Subject: [PATCH 2/3] fix xcode versions

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index ded99832d..2afcc18f4 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -276,7 +276,7 @@ jobs:
             soc: Intel
             type: Release
             use_ccache: 1
-            xcode: "26.3"
+            xcode: "26.6"
 
           - os: macOS
             target: 13
@@ -294,7 +294,7 @@ jobs:
             soc: Intel
             type: Release
             use_ccache: 1
-            xcode: "26.3"
+            xcode: "26.6"
 
           - os: macOS
             target: 14
@@ -311,7 +311,7 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "26.3"
+            xcode: "26.6"
 
           - os: macOS
             target: 15
@@ -328,7 +328,7 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "26.3"
+            xcode: "26.6"
 
           - os: macOS
             target: 26
@@ -344,7 +344,7 @@ jobs:
             soc: Apple
             type: Release
             use_ccache: 1
-            xcode: "26.3"
+            xcode: "26.6"
 
           - os: Windows
             target: 10

From 3ce168f38cecf9b1e69dd8fd3329a1b8511b5f27 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 5 Jul 2026 19:43:22 +0200
Subject: [PATCH 3/3] fix cross-arch compilation test

---
 .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 2afcc18f4..6f8811f55 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -286,7 +286,7 @@ jobs:
             cmake_generator: Ninja
             make_package: 1
             override_target: 13
-            override_arch: arm64
+            override_arch: x86_64
             package_suffix: "-macOS13_Intel2"
             qt_version: 6.11.0
             qt_arch: clang_64