From da4f88824080b81c63f856b3a4745e568b4308f5 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Wed, 22 Nov 2023 13:08:56 +0300 Subject: [PATCH 1/3] ci: use clang-15 instead of clang-12 in Linux CI --- .github/workflows/ci_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index ccd6b9e85..a25682335 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -48,8 +48,8 @@ jobs: run: pip install conan==1.59.0 - name: Configure with cmake run: | - export CC=clang-12 - export CXX=clang++-12 + export CC=clang-15 + export CXX=clang++-15 ${CXX} --version mkdir build && cd build conan profile new default --detect From a027e7d375f89fd979aa09e3d1f9272a08d579cb Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Wed, 22 Nov 2023 13:33:56 +0300 Subject: [PATCH 2/3] ci: add STORM_USE_CONAN_SDL=OFF in Linux CI --- .github/workflows/ci_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index a25682335..926870a17 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -55,7 +55,7 @@ jobs: conan profile new default --detect conan profile update conf.tools.system.package_manager:mode=install default conan profile update conf.tools.system.package_manager:sudo=True default - cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.configuration}} + cmake .. -DSTORM_USE_CONAN_SDL=OFF -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.configuration}} - name: Build dependencies run: ninja dependencies working-directory: build From 7f911790b20893774c9756cf2d920f5b74ec58d6 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Wed, 22 Nov 2023 13:45:06 +0300 Subject: [PATCH 3/3] conan: update sentry-native from 0.5.0 to 0.6.5 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 6b5aab006..adefc52aa 100644 --- a/conanfile.py +++ b/conanfile.py @@ -17,7 +17,7 @@ class StormEngine(ConanFile): # dependencies used in deploy binaries # conan-center - requires = ["zlib/1.2.13", "spdlog/1.9.2", "fast_float/3.4.0", "mimalloc/2.0.3", "sentry-native/0.5.0", + requires = ["zlib/1.2.13", "spdlog/1.9.2", "fast_float/3.4.0", "mimalloc/2.0.3", "sentry-native/0.6.5", # storm.jfrog.io "directx/9.0@storm/prebuilt", "fmod/2.02.05@storm/prebuilt"] # aux dependencies (e.g. for tests)