From 5ebed60434adceb289d5371b1e35ac2b11386e87 Mon Sep 17 00:00:00 2001 From: offa <8887756+offa@users.noreply.github.com> Date: Thu, 12 Mar 2026 14:20:40 +0100 Subject: [PATCH] Migrate to Conan Action --- .github/workflows/ci.yml | 2 ++ script/ci_build.sh | 8 -------- script/conan_build.sh | 6 ------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de0affd..4c7f8a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: name: "${{ matrix.compiler }}" steps: - uses: actions/checkout@main + - uses: offa/conan-action@b8e0a7119ebc3655d47130251e75c206aba96145 - name: Build run: script/ci_build.sh @@ -39,6 +40,7 @@ jobs: name: "conan ${{ matrix.compiler }}" steps: - uses: actions/checkout@main + - uses: offa/conan-action@b8e0a7119ebc3655d47130251e75c206aba96145 - name: Build run: script/conan_build.sh diff --git a/script/ci_build.sh b/script/ci_build.sh index 16f5649..0baf93e 100755 --- a/script/ci_build.sh +++ b/script/ci_build.sh @@ -4,14 +4,6 @@ set -ex BUILD_TYPE="Release" -# Conan -export DEBIAN_FRONTEND=noninteractive -export PATH=$HOME/.local/bin:$PATH -apt-get update -apt-get install -y pipx -pipx install conan -conan profile detect - if [[ "${CXX}" == clang* ]] then export CXXFLAGS="-stdlib=libc++" diff --git a/script/conan_build.sh b/script/conan_build.sh index 7898cde..ec8dc3a 100755 --- a/script/conan_build.sh +++ b/script/conan_build.sh @@ -2,10 +2,4 @@ set -ex -export PATH=$HOME/.local/bin:$PATH -apt-get update -apt-get install -y pipx -pipx install conan - -conan profile detect conan create -o unittest=True --build=missing .