Skip to content

Commit 8330724

Browse files
committed
Fix Conan options in CI build
1 parent c136d25 commit 8330724

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ jobs:
7373
conan profile detect
7474
echo "tools.cmake.cmaketoolchain:generator=Ninja" >> ~/.conan2/global.conf
7575
mkdir build
76-
conan install -o "influxdb_cxx/*":boost=${{ matrix.boost }} -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build
76+
conan install -o "&":boost=${{ matrix.boost }} -s compiler.cppstd=20 --build=missing . -of build
7777
conan install --build=missing -of build --requires "libcurl/7.87.0" --deployer full_deploy
7878
- name: Build
7979
run: |
8080
export CL="/ID:\a\influxdb-cxx\influxdb-cxx\build\host\libcurl\7.87.0\Release\x86_64\include"
81-
script/ci_build.sh -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS_INIT=-D_WIN32_WINNT=0x0A00
81+
script/ci_build.sh -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS_INIT=-D_WIN32_WINNT=0x0A00 -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }}
8282
- name: Install
8383
run: cmake --build --preset conan-release --target install
8484

@@ -101,7 +101,7 @@ jobs:
101101
pipx install conan
102102
conan profile detect
103103
mkdir build
104-
conan install -o "influxdb_cxx/*":system=True -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build
104+
conan install -o "&":system=True -s compiler.cppstd=20 --build=missing . -of build
105105
- name: Build
106106
run: script/ci_build.sh
107107
- name: Install

0 commit comments

Comments
 (0)