diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a32fd88825..3565dd6820f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,7 @@ env: 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.0.2 - OPENSSL_1_1_1_VERSION: 1.1.1w - OPENSSL_1_1_1_SHA256: "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8" - OPENSSL_1_1_1_DIR: /usr/local/ssl + CONAN_VERSION: 2.4.0 jobs: build-ubuntu-docker: diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 1023115b3a3..973538d4ccd 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -11,7 +11,7 @@ env: QT_QPA_PLATFORM: minimal # Last known good conan version # 2.0.3 has a bug on Windows (conan-io/conan#13606) - CONAN_VERSION: 2.0.2 + CONAN_VERSION: 2.4.0 concurrency: group: test-windows-${{ github.ref }} diff --git a/conanfile.py b/conanfile.py index 95f95033da5..b5b2ebc4baa 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,7 @@ class Chatterino(ConanFile): name = "Chatterino" - requires = "libavif/1.0.1" + requires = "libavif/1.0.4" settings = "os", "compiler", "build_type", "arch" default_options = { "with_benchmark": False, @@ -24,14 +24,11 @@ def requirements(self): if self.settings.os != "Windows": return - self.requires("boost/1.83.0") + self.requires("boost/1.85.0") if self.options.get_safe("with_benchmark", False): - self.requires("benchmark/1.7.1") + self.requires("benchmark/1.8.4") - if self.options.get_safe("with_openssl3", False): - self.requires("openssl/3.2.0") - else: - self.requires("openssl/1.1.1t") + self.requires("openssl/3.2.2") def generate(self): def copy_bin(dep, selector, subdir):