From 8d113a3faadae6139cada52f57524fca5fd5eba4 Mon Sep 17 00:00:00 2001 From: Pepijn Noltes Date: Sat, 30 Dec 2023 17:34:33 +0100 Subject: [PATCH] Remove cpputest from build config --- .github/workflows/coverity-scan.yml | 1 - .github/workflows/macos.yml | 4 ++-- .github/workflows/ubuntu.yml | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index c9d303d5e..534733474 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -26,7 +26,6 @@ jobs: cmake \ libffi-dev \ libxml2-dev \ - libcpputest-dev \ rapidjson-dev \ libavahi-compat-libdnssd-dev \ libcivetweb-dev \ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 026dfbbc7..08cb8da96 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -59,7 +59,7 @@ jobs: -o celix/*:framework_curlinit=False -o celix/*:enable_ccache=True run: | - conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest + conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of build ${CONAN_BUILD_OPTIONS} -b missing - name: Test run: | cd build @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov cpputest jansson rapidjson libzip ccache ninja + brew install lcov jansson rapidjson libzip ccache ninja - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index df0d9f402..df2994f1f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -80,7 +80,7 @@ jobs: -o celix:framework_curlinit=False -o celix:enable_ccache=True run: | - conan install . celix/ci -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest --require-override=openssl/1.1.1s + conan install . celix/ci -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=openssl/1.1.1s - name: Build env: CC: ${{ matrix.compiler[0] }} @@ -119,7 +119,6 @@ jobs: cmake \ libffi-dev \ libxml2-dev \ - libcpputest-dev \ rapidjson-dev \ libavahi-compat-libdnssd-dev \ libcivetweb-dev \