From 10242eaf4906617bad3c0e9c588ba09f433dd55c Mon Sep 17 00:00:00 2001 From: Dmitry Matveev Date: Tue, 10 Oct 2023 05:46:41 +0100 Subject: [PATCH 1/3] CI: Remove Ninja as it is not listed in Windows image https://github.com/actions/runner-images/blob/win22/20231002.1/images/win/Windows2022-Readme.md --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 844d8b0..0c3b724 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -27,7 +27,7 @@ jobs: mkdir build && cd build if [ "$RUNNER_OS" == "Windows" ]; then - cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} -G Ninja .. + cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} .. cmake --build . --target GTest cmake --build . From b106b3c2c02f97cbdd7769c65880c8d3aab518ca Mon Sep 17 00:00:00 2001 From: Dmitry Matveev Date: Tue, 10 Oct 2023 06:07:09 +0100 Subject: [PATCH 2/3] CI: Specify --config Release in Github Actions worklfow on Windows --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 0c3b724..1f41c89 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -28,8 +28,8 @@ jobs: if [ "$RUNNER_OS" == "Windows" ]; then cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} .. - cmake --build . --target GTest - cmake --build . + cmake --build . --target GTest --config Release + cmake --build . --config Release elif [ "$RUNNER_OS" == "Linux" ]; then cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} .. From d295d8f9df3c97f49981ce74fd4d98cd858880ee Mon Sep 17 00:00:00 2001 From: Dmitry Matveev Date: Tue, 10 Oct 2023 06:16:12 +0100 Subject: [PATCH 3/3] CI: Finally, use ctest --- .github/workflows/workflow.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 1f41c89..5c84e61 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -40,10 +40,6 @@ jobs: exit 1 fi - - name: ADE-Test Stage + - name: Test Stage shell: bash - run: ./build/bin/ade-tests - - - name: CMN-Test Stage - shell: bash - run: ./build/bin/common-tests + run: ctest -C Release