From 5f1377782f2d94a856e0fcd8723398bb910acce1 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Sun, 8 Oct 2023 19:36:09 +0300 Subject: [PATCH] updates --- .github/workflows/static_analysis.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index dfe0b362eb4..7f4801e5a2c 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -7,8 +7,8 @@ on: branches: ['**'] jobs: - cppcheck: - name: cppcheck + CppCheck: + name: CppCheck timeout-minutes: 30 runs-on: ubuntu-22.04 steps: @@ -96,8 +96,10 @@ jobs: echo "commit all files in the artifact to .github/workflows/ if these are valid results" exit 1 #---------------------------------------------------------------------------------------------------# - test_downloader: - name: "Run CMake compatibility tool" + # We verify the minimal CMake version we support is preserved when building with default CMake flags + minimal_cmake_version: + name: "Minimal CMake version" + id: minimal_cmake_version runs-on: ubuntu-22.04 steps: - name: Checkout @@ -131,11 +133,11 @@ jobs: - name: "Check minimal CMake version" run: | - if [ "${{steps.cmake_version.outputs.current_cmake_version}}" == "${EXPECTED_CMAKE_VERSION}" ] || [ "${{steps.cmake_version.outputs.current_cmake_version}}" \< "${EXPECTED_CMAKE_VERSION}" ] + if [ "${{minimal_cmake_version.steps.cmake_version.outputs.current_cmake_version}}" == "${EXPECTED_CMAKE_VERSION}" ] || [ "${{minimal_cmake_version.steps.cmake_version.outputs.current_cmake_version}}" \< "${EXPECTED_CMAKE_VERSION}" ] then - echo "The test PASSED, current CMake version is ${{steps.cmake_version.outputs.current_cmake_version}} and it is not higher than ${EXPECTED_CMAKE_VERSION}" + echo "The test PASSED, current CMake version is ${{minimal_cmake_version.steps.cmake_version.outputs.current_cmake_version}} and it is not higher than ${EXPECTED_CMAKE_VERSION}" exit 0 else - echo "Error - LibRS minimal CMake version require is ${EXPECTED_CMAKE_VERSION} but on this build the minimal is ${{steps.cmake_version.outputs.current_cmake_version}}" + echo "Error - LibRS minimal CMake version require is ${EXPECTED_CMAKE_VERSION} but on this build the minimal is ${{minimal_cmake_version.steps.cmake_version.outputs.current_cmake_version}}" exit 1 fi