Merge branch 'lessoptionalsiliconmoreoptionalintel' into 'master'
Make MR Silicon jobs less optional and Intel jobs more optional See merge request OpenMW/openmw!5173
This commit is contained in:
+10
-2
@@ -553,8 +553,8 @@ Ubuntu_GCC_integration_tests_asan:
|
||||
rules:
|
||||
- if: $CI_PROJECT_ID != "7107382"
|
||||
when: never
|
||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||
when: manual
|
||||
# Merge request event rule is architecture-specific
|
||||
# Unlike ARM64, AMD64 job is manual non-blocking as it's seldom useful
|
||||
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule"
|
||||
image: macos-15-xcode-16
|
||||
tags:
|
||||
@@ -593,6 +593,11 @@ Ubuntu_GCC_integration_tests_asan:
|
||||
|
||||
macOS15_Xcode16_amd64:
|
||||
extends: .MacOS
|
||||
rules:
|
||||
- !reference [.MacOS, rules]
|
||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
cache:
|
||||
key:
|
||||
prefix: macOS15_Xcode16_amd64.v3
|
||||
@@ -610,6 +615,9 @@ macOS15_Xcode16_amd64:
|
||||
|
||||
macOS15_Xcode16_arm64:
|
||||
extends: .MacOS
|
||||
rules:
|
||||
- !reference [.MacOS, rules]
|
||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||
cache:
|
||||
key:
|
||||
prefix: macOS15_Xcode16_arm64.v3
|
||||
|
||||
Reference in New Issue
Block a user