Merge pull request storm-devs#512 from q4a/ci-clang-upd

Fix Linux CI
q4a · Nov 25, 2023 · a68f43d · a68f43d
2 parents 2d3fd8d + 7f91179
commit a68f43d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -48,14 +48,14 @@ 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
         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

diff --git 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)