Skip to content

Commit 8eb7ff0

Browse files
committed
Make MR Silicon jobs less optional and Intel jobs more optional
Silicon jobs are now cheap enough to be pocket change even when there are no cache hits and can often be useful while the manual Intel jobs should not be blocking and are typically not useful unless the MR explicitly attempts CI changes
1 parent 7873299 commit 8eb7ff0

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ Ubuntu_GCC_integration_tests_asan:
553553
rules:
554554
- if: $CI_PROJECT_ID != "7107382"
555555
when: never
556-
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
557-
when: manual
556+
# Merge request event rule is architecture-specific
557+
# Unlike ARM64, AMD64 job is manual non-blocking as it's seldom useful
558558
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule"
559559
image: macos-15-xcode-16
560560
tags:
@@ -593,6 +593,11 @@ Ubuntu_GCC_integration_tests_asan:
593593

594594
macOS15_Xcode16_amd64:
595595
extends: .MacOS
596+
rules:
597+
- !reference [.MacOS, rules]
598+
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
599+
when: manual
600+
allow_failure: true
596601
cache:
597602
key:
598603
prefix: macOS15_Xcode16_amd64.v3
@@ -610,6 +615,9 @@ macOS15_Xcode16_amd64:
610615

611616
macOS15_Xcode16_arm64:
612617
extends: .MacOS
618+
rules:
619+
- !reference [.MacOS, rules]
620+
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
613621
cache:
614622
key:
615623
prefix: macOS15_Xcode16_arm64.v3

0 commit comments

Comments
 (0)