From dc87c0d9644872dd526903c6105b3ccbb42d338f Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Mon, 3 Jul 2023 14:09:49 +0200 Subject: [PATCH 1/3] Revert "Build windows when pushing to main" This reverts commit 883574ab13aa936af97ecc3bd8bd6aac8396df38. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fc7d44893..ac1190e552 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -283,10 +283,10 @@ build-codec-sanitizers-linux: - *print-common-info - bash ci/build_codec_sanitizers_linux.sh -build-codec-windows-cmake: +.build-codec-windows-cmake: extends: - .build-job-windows-with-check-for-warnings - - .rules-main-push + - .rules-basis script: - *print-common-info-windows - $winoutdata = $null @@ -296,10 +296,10 @@ build-codec-windows-cmake: - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression - ("exit $LASTEXITCODE") | Invoke-Expression -build-codec-windows-msbuild: +.build-codec-windows-msbuild: extends: - .build-job-windows-with-check-for-warnings - - .rules-main-push + - .rules-basis script: - *print-common-info-windows - $winoutdata = $null -- GitLab From 9ce67a9645850a62a8a7251106f329918ba4f4f2 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Mon, 3 Jul 2023 14:09:59 +0200 Subject: [PATCH 2/3] Revert "deactivate all windows jobs until windows runners are back" This reverts commit e0abe2b8e8dd45ac48baf88dd83d3246d17df011. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac1190e552..afe2924204 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -283,7 +283,7 @@ build-codec-sanitizers-linux: - *print-common-info - bash ci/build_codec_sanitizers_linux.sh -.build-codec-windows-cmake: +build-codec-windows-cmake: extends: - .build-job-windows-with-check-for-warnings - .rules-basis @@ -296,7 +296,7 @@ build-codec-sanitizers-linux: - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression - ("exit $LASTEXITCODE") | Invoke-Expression -.build-codec-windows-msbuild: +build-codec-windows-msbuild: extends: - .build-job-windows-with-check-for-warnings - .rules-basis -- GitLab From dea854b36d1d2610cab0ef9c0897017b51c5884d Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Mon, 3 Jul 2023 14:10:05 +0200 Subject: [PATCH 3/3] Revert "Temporarily disable be-2-evs-windows -- Ericsson Windows runner to be paused" This reverts commit 6df461bd00e86c1f95732266a400adfe546adf8b. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afe2924204..5d97bec156 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -737,7 +737,7 @@ selection-test-processing: # --------------------------------------------------------------- # check bitexactness to EVS windows binaries -.be-2-evs-windows: # Temporarily disabled -- Ericsson Windows runner used for HL activities which the reduces capacity for this job. To be resumed after selection +be-2-evs-windows: extends: - .rules-main-push tags: -- GitLab