From ca1a0a26aedbb11a93d21854686dcaadeb1a0f64 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 12:27:59 +0100
Subject: [PATCH 01/14] ci: use conan on macos

---
 .github/workflows/build.yml      | 37 +++++++++++++++-----------------
 .github/workflows/test-macos.yml | 18 +++++++++++-----
 conanfile.py                     |  9 ++++----
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 372b15abc1a..dfb6b58fa06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -184,32 +184,31 @@ jobs:
           key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
           path: ~/.conan2/
 
-      - name: Install Conan (Windows)
-        if: startsWith(matrix.os, 'windows')
+      - name: Install Conan (Windows/macOS)
+        if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         run: |
           python3 -c "import site; import sys; print(f'{site.USER_BASE}\\Python{sys.version_info.major}{sys.version_info.minor}\\Scripts')" >> "$GITHUB_PATH"
           pip3 install --user "conan==${{ env.CONAN_VERSION }}"
-        shell: powershell
+        shell: bash
 
-      - name: Setup Conan (Windows)
-        if: startsWith(matrix.os, 'windows')
+      - name: Setup Conan (Windows/macOs)
+        if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         run: |
           conan --version
           conan profile detect -f
-        shell: powershell
+        shell: bash
 
-      - name: Install dependencies (Windows)
-        if: startsWith(matrix.os, 'windows')
+      - name: Install dependencies (Windows/macOS)
+        if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         run: |
           mkdir build
           cd build
-          conan install .. `
-              -s build_type=RelWithDebInfo `
-              -c tools.cmake.cmaketoolchain:generator="NMake Makefiles" `
-              -b missing `
-              --output-folder=. `
-              -o with_openssl3="$Env:C2_USE_OPENSSL3"
-        shell: powershell
+          conan install .. \
+              -s build_type=RelWithDebInfo \
+              -c tools.cmake.cmaketoolchain:generator="Ninja" \
+              -b missing \
+              --output-folder=.
+        shell: bash
 
       - name: Build (Windows)
         if: startsWith(matrix.os, 'windows')
@@ -278,11 +277,8 @@ jobs:
       - name: Install dependencies (MacOS)
         if: startsWith(matrix.os, 'macos')
         run: |
-          brew tap-new gh/local-boost
-          brew tap homebrew/core --force
-          brew extract --version=1.86.0 boost gh/local-boost
           # binary dependencies
-          ./.CI/SetupHomebrewDeps.sh boost@1.86.0 openssl@3
+          ./.CI/SetupHomebrewDeps.sh openssl@3
           # build and header-only dependencies
           brew install rapidjson p7zip create-dmg cmake tree
         shell: bash
@@ -290,10 +286,11 @@ jobs:
       - name: Build (MacOS)
         if: startsWith(matrix.os, 'macos')
         run: |
-          mkdir build
+          mkdir -p build
           cd build
           cmake \
               -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" \
               -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 \
               -DUSE_PRECOMPILED_HEADERS=OFF \
               -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 95436335863..2837da26c86 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -57,11 +57,18 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install openssl rapidjson p7zip create-dmg cmake
-          brew tap-new gh/local-boost
-          brew tap homebrew/core --force
-          brew extract --version=1.86.0 boost gh/local-boost
-          brew install boost@1.86.0
+          brew install openssl rapidjson p7zip create-dmg cmake ninja
+
+          pip install conan
+          conan --version
+          conan profile detect -f
+          mkdir build
+          cd build
+          conan install .. \
+              -s build_type=RelWithDebInfo \
+              -c tools.cmake.cmaketoolchain:generator="Ninja" \
+              -b missing \
+              --output-folder=.
 
       - name: Install httpbox
         run: |
@@ -76,6 +83,7 @@ jobs:
           cd build-test
           cmake \
               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+              -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" \
               -DBUILD_TESTS=On \
               -DBUILD_APP=OFF \
               -DUSE_PRECOMPILED_HEADERS=OFF \
diff --git a/conanfile.py b/conanfile.py
index b5b2ebc4baa..dff59fd8394 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -5,7 +5,6 @@
 
 class Chatterino(ConanFile):
     name = "Chatterino"
-    requires = "libavif/1.0.4"
     settings = "os", "compiler", "build_type", "arch"
     default_options = {
         "with_benchmark": False,
@@ -21,14 +20,16 @@ class Chatterino(ConanFile):
     generators = "CMakeDeps", "CMakeToolchain"
 
     def requirements(self):
+        self.requires("boost/1.86.0")
+
         if self.settings.os != "Windows":
             return
 
-        self.requires("boost/1.85.0")
+        self.requires("libavif/1.1.1")
         if self.options.get_safe("with_benchmark", False):
-            self.requires("benchmark/1.8.4")
+            self.requires("benchmark/1.9.0")
 
-        self.requires("openssl/3.2.2")
+        self.requires("openssl/3.3.2")
 
     def generate(self):
         def copy_bin(dep, selector, subdir):

From 37373eb602ad231001724d81aeeebe07e0a69708 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 12:35:10 +0100
Subject: [PATCH 02/14] h

---
 .github/workflows/build.yml      | 8 ++++++--
 .github/workflows/test-macos.yml | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dfb6b58fa06..ad37ce39a1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -184,11 +184,15 @@ jobs:
           key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
           path: ~/.conan2/
 
+      - uses: actions/setup-python@v5
+        if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
+        with:
+          python-version: "3.13"
+
       - name: Install Conan (Windows/macOS)
         if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         run: |
-          python3 -c "import site; import sys; print(f'{site.USER_BASE}\\Python{sys.version_info.major}{sys.version_info.minor}\\Scripts')" >> "$GITHUB_PATH"
-          pip3 install --user "conan==${{ env.CONAN_VERSION }}"
+          pip install conan
         shell: bash
 
       - name: Setup Conan (Windows/macOs)
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 2837da26c86..59188a17767 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -55,6 +55,10 @@ jobs:
           modules: ${{ env.QT_MODULES }}
           version: ${{ matrix.qt-version }}
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
       - name: Install dependencies
         run: |
           brew install openssl rapidjson p7zip create-dmg cmake ninja

From a7b663f9fdceb77476451041b693cbcbbd39c442 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 12:40:26 +0100
Subject: [PATCH 03/14] i

---
 .CI/SetupHomebrewDeps.sh         | 4 ++--
 .github/workflows/test-macos.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.CI/SetupHomebrewDeps.sh b/.CI/SetupHomebrewDeps.sh
index ab61d01a688..632ed136e4d 100755
--- a/.CI/SetupHomebrewDeps.sh
+++ b/.CI/SetupHomebrewDeps.sh
@@ -73,8 +73,8 @@ do
     arch -x86_64 "$x86_64_homebrew_dir/bin/brew" install $(arch -x86_64 "$x86_64_homebrew_dir/bin/brew" --cache --bottle-tag=x86_64_ventura "$dep")
 done
 
-echo "Relinking boost libraries"
-c2-make-universal-dylib lib/libboost_random-mt.dylib
+# echo "Relinking boost libraries"
+# c2-make-universal-dylib lib/libboost_random-mt.dylib
 
 echo "Relinking OpenSSL 3 libcrypto"
 c2-make-universal-dylib lib/libcrypto.dylib
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 59188a17767..e73ea29f5ee 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -66,8 +66,8 @@ jobs:
           pip install conan
           conan --version
           conan profile detect -f
-          mkdir build
-          cd build
+          mkdir build-test
+          cd build-test
           conan install .. \
               -s build_type=RelWithDebInfo \
               -c tools.cmake.cmaketoolchain:generator="Ninja" \
@@ -83,7 +83,7 @@ jobs:
 
       - name: Build
         run: |
-          mkdir build-test
+          mkdir -p build-test
           cd build-test
           cmake \
               -DCMAKE_BUILD_TYPE=RelWithDebInfo \

From b4cb6208684096c5f3989cd0ebf49508727b4aa3 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 13:04:09 +0100
Subject: [PATCH 04/14] j

---
 cmake/FindRapidJSON.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/FindRapidJSON.cmake b/cmake/FindRapidJSON.cmake
index 57ec5b638c0..4aeb9f67c66 100644
--- a/cmake/FindRapidJSON.cmake
+++ b/cmake/FindRapidJSON.cmake
@@ -4,6 +4,8 @@ find_path(RapidJSON_INCLUDE_DIR rapidjson/rapidjson.h HINTS ${CMAKE_SOURCE_DIR}/
 
 find_package_handle_standard_args(RapidJSON DEFAULT_MSG RapidJSON_INCLUDE_DIR)
 
+message(STATUS "f=${RapidJSON_FOUND} - i=${RapidJSON_INCLUDE_DIR}")
+
 if (RapidJSON_FOUND)
     add_library(RapidJSON::RapidJSON INTERFACE IMPORTED)
     set_target_properties(RapidJSON::RapidJSON PROPERTIES

From cf9284a09944c91b544e429c1a39471f6a008f98 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 13:14:25 +0100
Subject: [PATCH 05/14] k

---
 CMakeLists.txt            | 2 +-
 cmake/FindRapidJSON.cmake | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c12075e350c..76cf1b7fabd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,7 @@ if (BUILD_WITH_QTKEYCHAIN)
     endif()
 endif()
 
-find_package(RapidJSON REQUIRED)
+find_package(RapidJSON MODULE REQUIRED)
 
 find_package(Websocketpp REQUIRED)
 
diff --git a/cmake/FindRapidJSON.cmake b/cmake/FindRapidJSON.cmake
index 4aeb9f67c66..57ec5b638c0 100644
--- a/cmake/FindRapidJSON.cmake
+++ b/cmake/FindRapidJSON.cmake
@@ -4,8 +4,6 @@ find_path(RapidJSON_INCLUDE_DIR rapidjson/rapidjson.h HINTS ${CMAKE_SOURCE_DIR}/
 
 find_package_handle_standard_args(RapidJSON DEFAULT_MSG RapidJSON_INCLUDE_DIR)
 
-message(STATUS "f=${RapidJSON_FOUND} - i=${RapidJSON_INCLUDE_DIR}")
-
 if (RapidJSON_FOUND)
     add_library(RapidJSON::RapidJSON INTERFACE IMPORTED)
     set_target_properties(RapidJSON::RapidJSON PROPERTIES

From 0a9477e95877112f7648af9a6c9707de09a5efe0 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 13:37:13 +0100
Subject: [PATCH 06/14] l

---
 .github/workflows/test-macos.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index e73ea29f5ee..bcc5174743f 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -95,6 +95,9 @@ jobs:
               -DBUILD_WITH_QT6="$C2_BUILD_WITH_QT6" \
               ..
           make -j"$(sysctl -n hw.logicalcpu)"
+      - name: Setup tmate session
+        if: failure()
+        uses: mxschmitt/action-tmate@v3
 
       - name: Download and extract Twitch PubSub Server Test
         run: |

From 6c56c5af978d2c8edf6d88cb7af3ed16afb82839 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 13:42:54 +0100
Subject: [PATCH 07/14] m

---
 .github/workflows/build.yml      | 4 ++++
 .github/workflows/test-macos.yml | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad37ce39a1b..f1018847e4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -306,6 +306,10 @@ jobs:
           make -j"$(sysctl -n hw.logicalcpu)"
         shell: bash
 
+      - name: Setup tmate session
+        if: failure()
+        uses: mxschmitt/action-tmate@v3
+
       - name: Package (MacOS)
         if: startsWith(matrix.os, 'macos')
         env:
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index bcc5174743f..e73ea29f5ee 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -95,9 +95,6 @@ jobs:
               -DBUILD_WITH_QT6="$C2_BUILD_WITH_QT6" \
               ..
           make -j"$(sysctl -n hw.logicalcpu)"
-      - name: Setup tmate session
-        if: failure()
-        uses: mxschmitt/action-tmate@v3
 
       - name: Download and extract Twitch PubSub Server Test
         run: |

From 58905e56b8857151907a5756db8866ab873b4d7c Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 13:58:56 +0100
Subject: [PATCH 08/14] n

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76cf1b7fabd..5800c270c5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,7 @@ find_package(Sanitizers QUIET)
 
 # Find boost on the system
 find_package(Boost REQUIRED OPTIONAL_COMPONENTS headers)
+message(STATUS "BOOST_LIBS=${Boost_LIBRARIES}")
 
 # Find OpenSSL on the system
 find_package(OpenSSL REQUIRED)

From 5ca8635685155bfaf06cd3fba4e60730990bf073 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 14:11:29 +0100
Subject: [PATCH 09/14] o

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1018847e4e..999fa9de6e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -209,6 +209,7 @@ jobs:
           cd build
           conan install .. \
               -s build_type=RelWithDebInfo \
+              ${{startsWith(matrix.os, 'macos') && '-s="arch=armv8|x86_64"' || ''}} \
               -c tools.cmake.cmaketoolchain:generator="Ninja" \
               -b missing \
               --output-folder=.

From f423e4c4d0113b68015598839b6ebc75bfa15449 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 14:57:30 +0100
Subject: [PATCH 10/14] p

---
 conanfile.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/conanfile.py b/conanfile.py
index dff59fd8394..40189cec7ac 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,5 +1,6 @@
 from conan import ConanFile
 from conan.tools.files import copy
+from conan.tools.cmake import CMakeToolchain
 from os import path
 
 
@@ -17,7 +18,7 @@ class Chatterino(ConanFile):
         # Qt is built with OpenSSL 3 from version 6.5.0 onwards
         "with_openssl3": [True, False],
     }
-    generators = "CMakeDeps", "CMakeToolchain"
+    generators = "CMakeDeps"
 
     def requirements(self):
         self.requires("boost/1.86.0")
@@ -32,6 +33,16 @@ def requirements(self):
         self.requires("openssl/3.3.2")
 
     def generate(self):
+        tc = CMakeToolchain(self)
+        tc.blocks.remove("compilers")
+        tc.blocks.remove("cmake_flags_init")
+        tc.blocks.remove("cppstd")
+        tc.blocks.remove("libcxx")
+        tc.blocks.remove("generic_system")
+        tc.blocks.remove("user_toolchain")
+        tc.blocks.remove("output_dirs")
+        tc.generate()
+
         def copy_bin(dep, selector, subdir):
             src = path.realpath(dep.cpp_info.bindirs[0])
             dst = path.realpath(path.join(self.build_folder, subdir))

From 9de0a58fe310958310c0a26c622378aacecd332b Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 15:08:06 +0100
Subject: [PATCH 11/14] q

---
 .github/workflows/build.yml | 3 +--
 CMakeLists.txt              | 1 -
 conanfile.py                | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 999fa9de6e1..930c4c4e578 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -208,8 +208,7 @@ jobs:
           mkdir build
           cd build
           conan install .. \
-              -s build_type=RelWithDebInfo \
-              ${{startsWith(matrix.os, 'macos') && '-s="arch=armv8|x86_64"' || ''}} \
+              -s build_type=${{startsWith(matrix.os, 'macos') && 'Release' || 'RelWithDebInfo'}} \
               -c tools.cmake.cmaketoolchain:generator="Ninja" \
               -b missing \
               --output-folder=.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5800c270c5d..76cf1b7fabd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,6 @@ find_package(Sanitizers QUIET)
 
 # Find boost on the system
 find_package(Boost REQUIRED OPTIONAL_COMPONENTS headers)
-message(STATUS "BOOST_LIBS=${Boost_LIBRARIES}")
 
 # Find OpenSSL on the system
 find_package(OpenSSL REQUIRED)
diff --git a/conanfile.py b/conanfile.py
index 40189cec7ac..bef8904f9d3 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -41,6 +41,7 @@ def generate(self):
         tc.blocks.remove("generic_system")
         tc.blocks.remove("user_toolchain")
         tc.blocks.remove("output_dirs")
+        tc.blocks.remove("apple_system")
         tc.generate()
 
         def copy_bin(dep, selector, subdir):

From 6a6eb3b0aee828cf1275805b92e04c945dbf7c7a Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 15:18:45 +0100
Subject: [PATCH 12/14] r

---
 .github/workflows/build.yml      | 23 +++++++----------------
 .github/workflows/test-macos.yml |  3 ++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 930c4c4e578..7395a7f4c9c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,9 +19,7 @@ env:
   C2_ENABLE_LTO: ${{ github.ref == 'refs/heads/chatterino7' || startsWith(github.ref, 'refs/heads/bugfix-release') || startsWith(github.ref, 'refs/heads/release/')}}
   CHATTERINO_REQUIRE_CLEAN_GIT: On
   C2_BUILD_WITH_QT6: Off
-  # Last known good conan version
-  # 2.0.3 has a bug on Windows (conan-io/conan#13606)
-  CONAN_VERSION: 2.4.0
+  CONAN_VERSION: 2.11.0
 
 jobs:
   build-ubuntu-docker:
@@ -184,20 +182,16 @@ jobs:
           key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
           path: ~/.conan2/
 
-      - uses: actions/setup-python@v5
+      - name: Setup Python (Windows/macOS)
+        uses: actions/setup-python@v5
         if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         with:
           python-version: "3.13"
 
-      - name: Install Conan (Windows/macOS)
-        if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
-        run: |
-          pip install conan
-        shell: bash
-
-      - name: Setup Conan (Windows/macOs)
+      - name: Install and Setup Conan (Windows/macOS)
         if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         run: |
+          pip install conan==${{env.CONAN_VERSION}}
           conan --version
           conan profile detect -f
         shell: bash
@@ -211,7 +205,8 @@ jobs:
               -s build_type=${{startsWith(matrix.os, 'macos') && 'Release' || 'RelWithDebInfo'}} \
               -c tools.cmake.cmaketoolchain:generator="Ninja" \
               -b missing \
-              --output-folder=.
+              --output-folder=. \
+              -o with_openssl3="$Env:C2_USE_OPENSSL3"
         shell: bash
 
       - name: Build (Windows)
@@ -306,10 +301,6 @@ jobs:
           make -j"$(sysctl -n hw.logicalcpu)"
         shell: bash
 
-      - name: Setup tmate session
-        if: failure()
-        uses: mxschmitt/action-tmate@v3
-
       - name: Package (MacOS)
         if: startsWith(matrix.os, 'macos')
         env:
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index e73ea29f5ee..2a009acedc0 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -12,6 +12,7 @@ env:
   QT_QPA_PLATFORM: minimal
   HOMEBREW_NO_AUTO_UPDATE: 1
   HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+  CONAN_VERSION: 2.11.0
 
 concurrency:
   group: test-macos-${{ github.ref }}
@@ -63,7 +64,7 @@ jobs:
         run: |
           brew install openssl rapidjson p7zip create-dmg cmake ninja
 
-          pip install conan
+          pip install conan==${{env.CONAN_VERSION}}
           conan --version
           conan profile detect -f
           mkdir build-test

From 98b4289b1f4f2bb19e502743b1058a0aa01089ab Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 15:25:57 +0100
Subject: [PATCH 13/14] s

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7395a7f4c9c..20e654070d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -206,7 +206,7 @@ jobs:
               -c tools.cmake.cmaketoolchain:generator="Ninja" \
               -b missing \
               --output-folder=. \
-              -o with_openssl3="$Env:C2_USE_OPENSSL3"
+              -o with_openssl3="$C2_USE_OPENSSL3"
         shell: bash
 
       - name: Build (Windows)

From 31e584f54fcf2c4bbd8f3d0aa81932754fd5563c Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Tue, 24 Dec 2024 16:01:06 +0100
Subject: [PATCH 14/14] t

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

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 2a009acedc0..ae508d8bffb 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13]
+        os: [macos-latest]
         qt-version: [6.7.1]
         plugins: [true]
       fail-fast: false