From 5c119261687a2f19dbc56b0473540ddbcf57d86a Mon Sep 17 00:00:00 2001 From: offa Date: Thu, 27 Jun 2024 20:22:11 +0200 Subject: [PATCH] Simplify conan install in CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1cec92..6cf7ac4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ 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 }}" -o "&:tests=True" -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: | @@ -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" -o ":tests=True" -s compiler.cppstd=20 --build=missing . -of build - name: Build run: script/ci_build.sh - name: Install