diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f9481bc2c..ac71542ba 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -18,11 +18,11 @@ jobs: runs-on: ubuntu-latest container: silkeh/clang:dev steps: + - name: Install git + run: apt-get update ; apt-get install -y git - uses: actions/checkout@v3 - name: Get latest CMake and ninja uses: lukka/get-cmake@latest - - name: Install git - run: apt-get update ; apt-get install -y git - name: Run CMake run: cmake -S . -B build -DJSON_CI=On - name: Build @@ -74,11 +74,11 @@ jobs: matrix: target: [ci_clang_tidy, ci_test_clang_sanitizer, ci_clang_analyze] steps: + - name: Install git + run: apt-get update ; apt-get install -y git - uses: actions/checkout@v3 - name: Get latest CMake and ninja uses: lukka/get-cmake@latest - - name: Install git - run: apt-get update ; apt-get install -y git - name: Run CMake run: cmake -S . -B build -DJSON_CI=On - name: Build diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 6d215a92f..874dda7e1 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -429,7 +429,7 @@ add_custom_target(ci_test_clang -DJSON_BuildTests=ON -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang - COMMAND cd ${PROJECT_BINARY_DIR}/build_clang && ${CMAKE_CTEST_COMMAND} -LE git_required --parallel ${N} --output-on-failure + COMMAND cd ${PROJECT_BINARY_DIR}/build_clang && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure COMMENT "Compile and test with Clang using maximal warning flags" ) @@ -571,7 +571,7 @@ add_custom_target(ci_test_clang_sanitizer -DJSON_BuildTests=ON -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_sanitizer - COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} -LE git_required --output-on-failure + COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure COMMENT "Compile and test with sanitizers" )