From a726bbae36467c714a64e53c90b629092dbf7896 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 26 Dec 2024 16:18:26 +1000 Subject: [PATCH] Not building tools project on Ubuntu-20.04 in github actions. --- .github/workflows/actions_build.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 3b55b84..c7ff431 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -121,7 +121,7 @@ jobs: COMMON_CXX_STANDARD: ${{matrix.cpp}} COMMS_TAG: ${{env.COMMS_TAG}} COMMSDSL_TAG: ${{env.COMMSDSL_TAG}} - CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} + CC_TOOLS_QT_SKIP: 1 - name: Configure CMake shell: bash @@ -129,11 +129,10 @@ jobs: run: | cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \ - -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} + -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON env: CC: gcc-${{matrix.cc_ver}} CXX: g++-${{matrix.cc_ver}} - BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}" - name: Build Target working-directory: ${{runner.workspace}}/build @@ -313,7 +312,7 @@ jobs: COMMON_CXX_STANDARD: ${{matrix.cpp}} COMMS_TAG: ${{env.COMMS_TAG}} COMMSDSL_TAG: ${{env.COMMSDSL_TAG}} - CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} + CC_TOOLS_QT_SKIP: 1 - name: Configure CMake shell: bash @@ -321,12 +320,10 @@ jobs: run: | cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \ - -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON \ - -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} + -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON env: CC: clang-${{matrix.cc_ver}} CXX: clang++-${{matrix.cc_ver}} - BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}" - name: Build Target working-directory: ${{runner.workspace}}/build @@ -375,7 +372,7 @@ jobs: COMMS_TAG: ${{env.COMMS_TAG}} COMMSDSL_TAG: ${{env.COMMSDSL_TAG}} CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} - CC_TOOLS_QT_SKIP: "${{ matrix.cpp < 17 && '1' || '0' }}" + CC_TOOLS_QT_SKIP: 1 - name: Configure CMake shell: bash @@ -383,11 +380,10 @@ jobs: run: | cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \ - -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} + -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON env: CC: clang-${{matrix.cc_ver}} CXX: clang++-${{matrix.cc_ver}} - BUILD_TOOLS: "${{ matrix.cpp == 17 && 'ON' || 'OFF' }}" - name: Build Target working-directory: ${{runner.workspace}}/build