Merge branch 'fix-ctest-win' into 'master'

[ci] cdash submit as a separate step on win too.

See merge request ogs/ogs!4670

scripts/ci/extends/template-build-win.yml

@@ -32,7 +32,8 @@
       elseif (-Not ($env:CI_MERGE_REQUEST_LABELS -match "unit_tests")) { $ctest_condition = $true }
       if($env:BUILD_CTEST -eq "true" -And $ctest_condition -eq $true)
       {
-        ctest --preset=$env:CMAKE_PRESET -LE large --output-junit Tests/ctest.xml -M Experimental --group $ctest_group --test-dir $build_directory_full -T Test -T Submit --no-tests=error
+        ctest --preset=$env:CMAKE_PRESET -LE large --output-junit Tests/ctest.xml -M Experimental --group $ctest_group --test-dir $build_directory_full -T Test --no-tests=error
+        ctest --test-dir $build_directory_full -T submit; $null
       }
     - |
       if($env:CHECK_WARNINGS -eq "true" -and (cat $log_file | Select-String -Pattern ': warning') )

scripts/ci/pipelines/linux.yml

 include:
   - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/ci_images.yml"
   - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/meta.yml"
-  - local: "/scripts/ci/jobs/ci_images.yml"
   - local: "/scripts/ci/jobs/build-linux.yml"
   - local: "/scripts/ci/jobs/build-linux-arch.yml"
   - local: "/scripts/ci/jobs/build-linux-petsc.yml"

scripts/ci/pipelines/mac.yml

 include:
   - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/ci_images.yml"
   - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/meta.yml"
   - local: "/scripts/ci/jobs/build-mac.yml"

scripts/ci/pipelines/win.yml

 include:
   - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/ci_images.yml"
   - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/meta.yml"
   - local: "/scripts/ci/jobs/build-win.yml"