From 86ffbd57ca1acdad2b330e6f25397dcf95f7fb28 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 14 Aug 2022 14:34:01 +0200 Subject: [PATCH] :alembic: try official GCC containers --- .github/workflows/ubuntu.yml | 8 ++++---- cmake/ci.cmake | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 80ba548d4..583426322 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -98,12 +98,12 @@ jobs: container: gcc:${{ matrix.compiler }} steps: - uses: actions/checkout@v3 - - name: Install CMake - run: wget https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-x86_64.tar.gz ; tar xfz cmake-3.24.0-linux-x86_64.tar.gz + - name: Get latest CMake and ninja + uses: lukka/get-cmake@latest - name: Run CMake - run: cmake-3.24.0-linux-x86_64/bin/cmake -S . -B build -DJSON_CI=On + run: cmake -S . -B build -DJSON_CI=On - name: Build - run: cmake-3.24.0-linux-x86_64/bin/cmake --build build --target ci_test_compiler_default + run: cmake --build build --target ci_test_compiler_default # ci_test_compilers: # runs-on: ubuntu-latest diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 8617ca4d1..39cd819e4 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -931,7 +931,7 @@ endforeach() add_custom_target(ci_test_compiler_default COMMAND ${CMAKE_COMMAND} - -DCMAKE_BUILD_TYPE=Debug + -DCMAKE_BUILD_TYPE=Debug -GNinja -DJSON_BuildTests=ON -DJSON_FastTests=ON -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_compiler_default ${ADDITIONAL_FLAGS}