Skip to content

Commit

Permalink
Fix C/I, take IV
Browse files Browse the repository at this point in the history
  • Loading branch information
kordejong committed Sep 2, 2023
1 parent 482cd06 commit 7b251ba
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linux Conda package
on:
push:
branches-ignore:
- "ghxyz"
- "gh547"
paths:
- "conanfile.py"
- ".github/workflows/linux-conda.yml"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ jobs:
libvulkan-dev \
${{ matrix.compiler.package }} \
ninja-build \
nlohmann-json3-dev \
pybind11-dev
nlohmann-json3-dev
- uses: conda-incubator/setup-miniconda@v2
with:
Expand All @@ -84,7 +83,7 @@ jobs:
python environment/script/write_conan_profile.py ${{ matrix.compiler.name }} build_profile
mkdir $GITHUB_WORKSPACE/../build
CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} \
LUE_CONAN_PACKAGES="imgui span-lite" \
LUE_CONAN_PACKAGES="imgui pybind11 span-lite" \
conan install . \
--profile:host=host_profile \
--profile:build=build_profile \
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def requirements(self):
self.requires("nlohmann_json/[>=3.10]")

if install_conan_package("pybind11"):
self.requires("pybind11/[>=2.9.1]")
self.requires("pybind11/[>=2.10.1]")

if install_conan_package("span-lite"):
self.requires("span-lite/[~0.10]")
Expand Down
2 changes: 1 addition & 1 deletion environment/cmake/LueConfiguration.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ endif()

if(LUE_PYBIND11_REQUIRED)
# Order matters: Pybind11 must be searched for after Python has been found.
find_package(pybind11 REQUIRED)
find_package(pybind11 2.10 REQUIRED)
endif()


Expand Down

0 comments on commit 7b251ba

Please sign in to comment.