Skip to content
This repository has been archived by the owner on Apr 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #512 from q4a/ci-clang-upd
Browse files Browse the repository at this point in the history
Fix Linux CI
  • Loading branch information
Hammie authored Nov 25, 2023
2 parents 2d3fd8d + 7f91179 commit a68f43d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a68f43d

Please sign in to comment.