diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 715a88874..10d443dd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,7 +115,7 @@ Debian_Clang_tests: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 -MacOS: +.MacOS: image: macos-11-xcode-12 tags: - macos @@ -123,20 +123,40 @@ MacOS: only: variables: - $CI_PROJECT_ID == "7107382" + cache: + paths: + - ccache/ script: - rm -fr build/* # remove anything in the build directory + - export CCACHE_BASEDIR="$(pwd)" + - export CCACHE_DIR="$(pwd)/ccache" + - mkdir -pv "${CCACHE_DIR}" + - ccache -z -M "${CCACHE_SIZE}" - CI/before_install.osx.sh - CI/before_script.osx.sh - cd build; make -j $(sysctl -n hw.logicalcpu) package - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.dmg"; done + - ccache -s artifacts: paths: - build/OpenMW-*.dmg - "build/**/*.log" +macOS11_Xcode12: + extends: .MacOS + image: macos-11-xcode-12 + cache: + key: macOS11_Xcode12.v1 + variables: + CCACHE_SIZE: 3G + macOS10.15_Xcode11: - extends: MacOS + extends: .MacOS image: macos-10.15-xcode-11 + cache: + key: macOS10.15_Xcode11.v1 + variables: + CCACHE_SIZE: 3G variables: &engine-targets targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"