From 210345cf09b9ebe0c8d27a1671b015899c70c4d6 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 26 Sep 2024 14:35:18 +0200 Subject: [PATCH] ci: fix windows container jobs being missing on forks The `.common-rules` need to be executed first, before all the "does this file exist? is it modified?" logic in the farm rules (and in api/driver/etc. rules after). The custom override in windows jobs was bypassing this, resulting in windows container jobs something being missing, breaking the pipelines. Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 17188fc9cc1..95b1df3a008 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -554,6 +554,7 @@ debian/baremetal_arm64_test: - .windows-docker-msvc - .windows-shell-tags rules: + - !reference [.common-rules, rules] - !reference [.microsoft-farm-container-rules, rules] - !reference [.container+build-rules, rules] variables: @@ -579,6 +580,7 @@ windows_build_msvc: extends: - .windows_container_build rules: + - !reference [.common-rules, rules] - !reference [.microsoft-farm-rules, rules] - !reference [.container+build-rules, rules] variables: @@ -597,6 +599,7 @@ windows_test_msvc: extends: - .windows_container_build rules: + - !reference [.common-rules, rules] - !reference [.microsoft-farm-rules, rules] - !reference [.container+build-rules, rules] variables: