r

SevenTV · Dec 24, 2024 · 6a6eb3b · 6a6eb3b
1 parent 9de0a58
commit 6a6eb3b
Showing 2 changed files with 9 additions and 17 deletions.
diff --git 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
@@ -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