From bd859960f4795f65ddfed1addc4e8fb1489be370 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 17 Jan 2021 14:41:06 +0100 Subject: [PATCH] :construction_worker: use GitHub Actions --- .github/workflows/ubuntu.yml | 4 ++-- cmake/ci.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7f932063a..11c5e7505 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -71,7 +71,7 @@ jobs: - name: install_gcc run: | sudo apt update - sudo apt install gcc-10 g++-10 + sudo apt install gcc-10 g++-10 ninja-build shell: bash - name: cmake run: cmake -S . -B build -DJSON_CI=On @@ -89,7 +89,7 @@ jobs: - name: install_clang run: | sudo apt update - sudo apt install clang-10 + sudo apt install clang-10 ninja-build shell: bash - name: cmake run: cmake -S . -B build -DJSON_CI=On diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 0c05964b7..2da75f434 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -17,7 +17,7 @@ execute_process(COMMAND ${CLANG_TIDY_TOOL} --version OUTPUT_VARIABLE CLANG_TIDY_ string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TIDY_TOOL_VERSION "${CLANG_TIDY_TOOL_VERSION}") message(STATUS "🔖 Clang-Tidy ${CLANG_TIDY_TOOL_VERSION} (${CLANG_TIDY_TOOL})") -find_program(CLANG_TOOL NAMES clang++-HEAD clang++-11 clang++) +find_program(CLANG_TOOL NAMES clang++-HEAD clang++-11 clang++-10 clang++) execute_process(COMMAND ${CLANG_TOOL} --version OUTPUT_VARIABLE CLANG_TOOL_VERSION ERROR_VARIABLE CLANG_TOOL_VERSION) string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TOOL_VERSION "${CLANG_TOOL_VERSION}") message(STATUS "🔖 Clang ${CLANG_TOOL_VERSION} (${CLANG_TOOL})") @@ -27,7 +27,7 @@ execute_process(COMMAND ${CPPCHECK_TOOL} --version OUTPUT_VARIABLE CPPCHECK_TOOL string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CPPCHECK_TOOL_VERSION "${CPPCHECK_TOOL_VERSION}") message(STATUS "🔖 Cppcheck ${CPPCHECK_TOOL_VERSION} (${CPPCHECK_TOOL})") -find_program(GCC_TOOL NAMES g++-HEAD g++-11 g++) +find_program(GCC_TOOL NAMES g++-HEAD g++-11 g++-10 g++) execute_process(COMMAND ${GCC_TOOL} --version OUTPUT_VARIABLE GCC_TOOL_VERSION ERROR_VARIABLE GCC_TOOL_VERSION) string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" GCC_TOOL_VERSION "${GCC_TOOL_VERSION}") message(STATUS "🔖 GCC ${GCC_TOOL_VERSION} (${GCC_TOOL})")