From f8e8c8e9ec9dcca6966818d2c68fa78a10a428b8 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 21 Aug 2022 21:39:48 +0200 Subject: [PATCH] :rewind: undo last changes --- .github/workflows/ubuntu.yml | 4 ---- cmake/ci.cmake | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3f46c9054..16065fb86 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -123,8 +123,6 @@ jobs: compiler: ['4', '5', '6', '7', '8', '9', '10', '11', '12', 'latest'] container: gcc:${{ matrix.compiler }} 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 @@ -140,8 +138,6 @@ jobs: compiler: ['3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', 'latest'] container: silkeh/clang:${{ matrix.compiler }} 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 diff --git a/cmake/ci.cmake b/cmake/ci.cmake index e650f1368..874dda7e1 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -939,7 +939,7 @@ add_custom_target(ci_test_compiler_default -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_compiler_default ${ADDITIONAL_FLAGS} COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_compiler_default --parallel ${N} - COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_default && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" --output-on-failure + COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_default && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" -LE git_required --output-on-failure COMMENT "Compile and test with default C++ compiler" )