diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42e6c47..95a5de3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: name: "${{ matrix.compiler }}" steps: - uses: actions/checkout@main + - uses: offa/conan-action@e9d361b93acd968d992b3bbb15b02b0beefb6b37 - name: Build run: script/ci_build.sh @@ -28,6 +29,7 @@ jobs: name: "MSVC" steps: - uses: actions/checkout@main + - uses: offa/conan-action@e9d361b93acd968d992b3bbb15b02b0beefb6b37 - name: Setup Ninja uses: turtlesec-no/get-ninja@3e85fb0044ada1440765803dd87c838edf79def8 - name: Setup MSVC diff --git a/script/ci_build.sh b/script/ci_build.sh index c718798..ab03a43 100755 --- a/script/ci_build.sh +++ b/script/ci_build.sh @@ -6,14 +6,10 @@ BUILD_TYPE="Release" if [[ -z ${WINDIR+x} ]] then - export PATH=$HOME/.local/bin:$PATH apt-get update - apt-get install -y pipx ninja-build + apt-get install -y ninja-build fi -pipx install conan -conan profile detect - if [[ "${CXX}" == clang* ]] then export CXXFLAGS="-stdlib=libc++"