Merge pull request #276 from offa/ci_options

Fix Conan options in CI build
offa · Nov 14, 2024 · d0050c8 · d0050c8
2 parents c136d25 + 8330724
commit d0050c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,12 +73,12 @@ jobs:
           conan profile detect
           echo "tools.cmake.cmaketoolchain:generator=Ninja" >> ~/.conan2/global.conf
           mkdir build
-          conan install -o "influxdb_cxx/*":boost=${{ matrix.boost }} -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build
+          conan install -o "&":boost=${{ matrix.boost }} -s compiler.cppstd=20 --build=missing . -of build
           conan install --build=missing -of build --requires "libcurl/7.87.0" --deployer full_deploy
       - name: Build
         run: |
           export CL="/ID:\a\influxdb-cxx\influxdb-cxx\build\host\libcurl\7.87.0\Release\x86_64\include"
-          script/ci_build.sh -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS_INIT=-D_WIN32_WINNT=0x0A00
+          script/ci_build.sh -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS_INIT=-D_WIN32_WINNT=0x0A00 -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }}
       - name: Install
         run: cmake --build --preset conan-release --target install
 
@@ -101,7 +101,7 @@ jobs:
           pipx install conan
           conan profile detect
           mkdir build
-          conan install -o "influxdb_cxx/*":system=True -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build
+          conan install -o "&":system=True -s compiler.cppstd=20 --build=missing . -of build
       - name: Build
         run: script/ci_build.sh
       - name: Install