cirrus: Switch to big-sur image, use catalina for bootstrap only

This commit is contained in:
Iain Buclaw 2021-10-06 18:07:33 +02:00
parent d893291693
commit 65dd51ca0f
2 changed files with 19 additions and 7 deletions

View file

@ -83,9 +83,9 @@ task:
# Mac # Mac
task: task:
name: macOS 10.15 x64, $TASK_NAME_SUFFIX name: macOS 11.x x64, $TASK_NAME_SUFFIX
osx_instance: osx_instance:
image: catalina-xcode image: big-sur-xcode
timeout_in: 60m timeout_in: 60m
environment: environment:
OS_NAME: darwin OS_NAME: darwin
@ -97,7 +97,19 @@ task:
- TASK_NAME_SUFFIX: DMD (latest) - TASK_NAME_SUFFIX: DMD (latest)
- TASK_NAME_SUFFIX: DMD (coverage) - TASK_NAME_SUFFIX: DMD (coverage)
<< : *COVERAGE_ENVIRONMENT_TEMPLATE << : *COVERAGE_ENVIRONMENT_TEMPLATE
- TASK_NAME_SUFFIX: DMD (bootstrap) << : *COMMON_STEPS_TEMPLATE
task:
name: macOS 10.15 x64, DMD (bootstrap)
osx_instance:
image: big-sur-xcode
timeout_in: 60m
environment:
OS_NAME: darwin
# override Cirrus default OS (`darwin`)
OS: osx
# 12 CPU cores and 24 GB of memory are available
N: 12
# de-facto bootstrap version on OSX # de-facto bootstrap version on OSX
# See: https://forum.dlang.org/post/qfsgt2$1goc$1@digitalmars.com # See: https://forum.dlang.org/post/qfsgt2$1goc$1@digitalmars.com
HOST_DMD: dmd-2.088.0 HOST_DMD: dmd-2.088.0

View file

@ -30,7 +30,7 @@ if [ "$OS_NAME" == "linux" ]; then
elif [ "$OS_NAME" == "darwin" ]; then elif [ "$OS_NAME" == "darwin" ]; then
# required for dlang install.sh # required for dlang install.sh
brew update-reset brew update-reset
brew install gnupg brew install gnupg libarchive xz
elif [ "$OS_NAME" == "freebsd" ]; then elif [ "$OS_NAME" == "freebsd" ]; then
packages="git gmake" packages="git gmake"
if [ "$HOST_DMD" == "dmd-2.079.0" ] ; then if [ "$HOST_DMD" == "dmd-2.079.0" ] ; then