mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-04 03:40:14 +00:00
Merge branch 'new-macos-ci-image' into 'master'
Use the new macOS image for the CI runner open beta See merge request OpenMW/openmw!690
This commit is contained in:
commit
22cf9bd823
@ -94,6 +94,7 @@ Debian_Clang_tests:
|
|||||||
BUILD_TESTS_ONLY: 1
|
BUILD_TESTS_ONLY: 1
|
||||||
|
|
||||||
MacOS:
|
MacOS:
|
||||||
|
image: macos-11-xcode-12
|
||||||
tags:
|
tags:
|
||||||
- macos
|
- macos
|
||||||
stage: build
|
stage: build
|
||||||
@ -111,6 +112,10 @@ MacOS:
|
|||||||
- build/OpenMW-*.dmg
|
- build/OpenMW-*.dmg
|
||||||
- "build/**/*.log"
|
- "build/**/*.log"
|
||||||
|
|
||||||
|
macOS10.15_Xcode11:
|
||||||
|
extends: MacOS
|
||||||
|
image: macos-10.15-xcode-11
|
||||||
|
|
||||||
variables: &engine-targets
|
variables: &engine-targets
|
||||||
targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
|
targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
|
||||||
package: "Engine"
|
package: "Engine"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user