From 2183afabc9bd495a62cf8bba65a98820583097bc Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 24 Jan 2025 16:42:33 +0100
Subject: [PATCH 1/4] Add comment to trigger MR pipeline

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6d1f6de4..9f19adb2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1004,7 +1004,7 @@ build-codec-sanitizers-linux:
     - *activate-Werror-linux
     - bash ci/build_codec_sanitizers_linux.sh
 
-    # TODO: reactivate once windows runners are available in BASOP project
+    # TODO: reactivate once windows runners are available in BASOP project -- test Ericsson windows runner
 .build-codec-windows-msbuild:
   extends:
     - .build-job-windows
-- 
GitLab


From 12528100487b9f5e28f2babcd6b83fdef59c772f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 24 Jan 2025 16:48:50 +0100
Subject: [PATCH 2/4] Enable windows build job

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f19adb2d..99ade6b93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1006,9 +1006,15 @@ build-codec-sanitizers-linux:
 
     # TODO: reactivate once windows runners are available in BASOP project -- test Ericsson windows runner
 .build-codec-windows-msbuild:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web'
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # trigger build job for all MRs
+    - if: $CI_PIPELINE_SOURCE == 'schedule'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
   extends:
     - .build-job-windows
-    - .rules-basis
   script:
     - *print-common-info-windows
     - *activate-WX-windows
-- 
GitLab


From aeaa0a99257b78feb808810dddd6e77fee0e5830 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 24 Jan 2025 16:56:44 +0100
Subject: [PATCH 3/4] Enable windows build job

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99ade6b93..1c149cecd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1005,7 +1005,7 @@ build-codec-sanitizers-linux:
     - bash ci/build_codec_sanitizers_linux.sh
 
     # TODO: reactivate once windows runners are available in BASOP project -- test Ericsson windows runner
-.build-codec-windows-msbuild:
+build-codec-windows-msbuild:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'web'
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -1015,6 +1015,9 @@ build-codec-sanitizers-linux:
       when: never
   extends:
     - .build-job-windows
+  timeout: "7 minutes"
+  tags:
+    - ivas-windows    
   script:
     - *print-common-info-windows
     - *activate-WX-windows
-- 
GitLab


From 992bda2bea7652c3b271ef313c98bdddfd70b5ad Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 28 Jan 2025 11:28:56 +0100
Subject: [PATCH 4/4] Cleanup of comments for build-codec-windows-msbuild

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c149cecd..b36c59ebf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -428,7 +428,6 @@ stages:
   needs: []
   timeout: "4 minutes"
   tags:
-    # TODO: set up ivas-basop-windows runners
     - ivas-windows
 
 # template for test jobs on linux that need the TESTV_DIR
@@ -1004,7 +1003,6 @@ build-codec-sanitizers-linux:
     - *activate-Werror-linux
     - bash ci/build_codec_sanitizers_linux.sh
 
-    # TODO: reactivate once windows runners are available in BASOP project -- test Ericsson windows runner
 build-codec-windows-msbuild:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'web'
-- 
GitLab