mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-09 20:35:48 -04:00
Bump mac CI image to macos-15-xcode-16 and tweak trigger rules
This commit is contained in:
parent
3b7b97c58c
commit
400c5a6dba
@ -502,7 +502,14 @@ Ubuntu_GCC_integration_tests_asan:
|
|||||||
.MacOS:
|
.MacOS:
|
||||||
stage: build
|
stage: build
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PROJECT_ID == "7107382"
|
- if: $CI_PROJECT_ID != "7107382"
|
||||||
|
when: never
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
|
when: manual
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule"
|
||||||
|
image: macos-15-xcode-16
|
||||||
|
tags:
|
||||||
|
- saas-macos-medium-m1
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
- ccache/
|
- ccache/
|
||||||
@ -537,11 +544,8 @@ Ubuntu_GCC_integration_tests_asan:
|
|||||||
|
|
||||||
macOS14_Xcode15_amd64:
|
macOS14_Xcode15_amd64:
|
||||||
extends: .MacOS
|
extends: .MacOS
|
||||||
image: macos-14-xcode-15
|
|
||||||
tags:
|
|
||||||
- saas-macos-medium-m1
|
|
||||||
cache:
|
cache:
|
||||||
key: macOS14_Xcode15_amd64.v2
|
key: macOS15_Xcode16_amd64.v1
|
||||||
variables:
|
variables:
|
||||||
CCACHE_SIZE: 3G
|
CCACHE_SIZE: 3G
|
||||||
DMG_IDENTIFIER: amd64
|
DMG_IDENTIFIER: amd64
|
||||||
@ -549,11 +553,8 @@ macOS14_Xcode15_amd64:
|
|||||||
|
|
||||||
macOS14_Xcode15_arm64:
|
macOS14_Xcode15_arm64:
|
||||||
extends: .MacOS
|
extends: .MacOS
|
||||||
image: macos-14-xcode-15
|
|
||||||
tags:
|
|
||||||
- saas-macos-medium-m1
|
|
||||||
cache:
|
cache:
|
||||||
key: macOS14_Xcode15_arm64.v1
|
key: macOS15_Xcode16_arm64.v1
|
||||||
variables:
|
variables:
|
||||||
DMG_IDENTIFIER: arm64
|
DMG_IDENTIFIER: arm64
|
||||||
CCACHE_SIZE: 3G
|
CCACHE_SIZE: 3G
|
||||||
|
Loading…
x
Reference in New Issue
Block a user