diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml index aab1df16656324741abfef63236209ac7e95009f..232daf4adeb4de278f65648293cae125273c418f 100644 --- a/scripts/ci/jobs/build-win.yml +++ b/scripts/ci/jobs/build-win.yml @@ -17,7 +17,7 @@ build win: -DOGS_BUILD_PROCESSES=GroundwaterFlow ` -DOGS_USE_PYTHON=ON ` -DOGS_CI_TESTRUNNER_REPEAT=1 - - cmake --build . + - cmake --build . | Tee-Object -FilePath make.output - cmake --build . --target tests - cmake --build . --target ctest - cp Testing/**/Test.xml Tests/ctest.xml diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml index 4462980f67626e5c748fe208c1d5e3700a71bd2f..0861dddda4a291c526227dbe3318ff928fc11afd 100644 --- a/scripts/ci/jobs/checks.yml +++ b/scripts/ci/jobs/checks.yml @@ -5,9 +5,14 @@ compiler warnings: allow_failure: true dependencies: - build + - build win script: - - cd build - - "if [[ $(cat make.output | grep warning -i) ]]; then echo 'There were compiler warnings:'; cat make.output | grep warning -i; exit 1; fi" + - exit_code=0 + - cd build + - "if [[ $(cat make.output | grep warning -i) ]]; then echo 'There were compiler warnings:'; cat make.output | grep warning -i; exit_code=1; fi" + - cd ../build-win + - "if [[ $(cat make.output | grep ': warning' -i) ]]; then echo 'There were compiler warnings:'; cat make.output | grep ': warning' -i; exit_code=1; fi" + - exit $exit_code ctest results: