Skip to content

Commit

Permalink
fix(ci): update conan install command in workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-vincent committed Jun 26, 2024
1 parent 9940b3e commit a19b1ad
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
LLVM_VERSION: 15
run: |
sudo apt-get update -y -q
sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg
sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg pkg-config
sudo wget https://apt.llvm.org/llvm.sh
sudo chmod +x llvm.sh
sudo ./llvm.sh ${LLVM_VERSION}
Expand All @@ -50,7 +50,10 @@ jobs:
pip install conan
conan profile detect --force
conan export third_party/funchook --version 1.1.3
conan install . --build=missing -s compiler.cppstd=17 -s compiler.libcxx=libc++ -s build_type=Debug -c tools.cmake.cmaketoolchain:generator=Ninja
conan install . --build=missing -s compiler.cppstd=17 -s compiler.libcxx=libc++ -s build_type=Debug \
-c tools.cmake.cmaketoolchain:generator=Ninja \
-c tools.system.package_manager:mode=install \
-c tools.system.package_manager:sudo=True
- name: Build with CMake
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,7 @@ jobs:
pip install conan
conan profile detect --force
conan export third_party/funchook --version 1.1.3
conan create . --build=missing -s compiler.cppstd=17 -s compiler.libcxx=libc++ -s build_type=${{ matrix.build_type }} -c tools.cmake.cmaketoolchain:generator=Ninja
conan create . --build=missing -s compiler.cppstd=17 -s compiler.libcxx=libc++ -s build_type=${{ matrix.build_type }} \
-c tools.cmake.cmaketoolchain:generator=Ninja \
-c tools.system.package_manager:mode=install \
-c tools.system.package_manager:sudo=True
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM base AS builder
ARG LLVM_VERSION=15

RUN apt-get update -y -qq \
&& apt-get install -y -qq build-essential lsb-release wget software-properties-common gnupg \
&& apt-get install -y -qq build-essential lsb-release wget software-properties-common gnupg pkg-config \
&& wget https://apt.llvm.org/llvm.sh \
&& chmod +x llvm.sh \
&& ./llvm.sh ${LLVM_VERSION} \
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
sdist.include = ["python/src/endstone/_internal/version.py"]

[tool.scikit-build-core-conan]
config = ["tools.cmake.cmaketoolchain:generator=Ninja"]
config = ["tools.cmake.cmaketoolchain:generator=Ninja", "tools.system.package_manager:mode=install"]

[[tool.scikit-build-core-conan.local-recipes]]
path = "third_party/funchook"
Expand Down

0 comments on commit a19b1ad

Please sign in to comment.