mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ci: Update cirrus macOS image to M1-based runners (#14772)

Browse source 
* druntime/test: Force makefile to x86 on Apple ARM cpu (dmd does not support ARM)

* ci: Update cirrus macOS image to M1-based runners

* compiler/test/Makefile: Workaround issue 23517
This commit is contained in:
Iain Buclaw 2023-01-02 20:15:23 +01:00 • committed by Petar Kirov
parent f382114888
commit aa19d8a145
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.cirrus.yml
View file

@ -82,38 +82,32 @@ linux_task:
<< : *COMMON_STEPS_TEMPLATE << : *COMMON_STEPS_TEMPLATE
# Mac # Mac
macos12_task: macos13_task:
name: macOS 12.x x64, $TASK_NAME_SUFFIX name: macOS 13.x x64 (M1), $TASK_NAME_SUFFIX
osx_instance: macos_instance:
image: monterey-xcode image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
timeout_in: 60m timeout_in: 60m
environment: environment:
OS_NAME: darwin OS_NAME: darwin
# override Cirrus default OS (`darwin`) # override Cirrus default OS (`darwin`)
OS: osx OS: osx
# 12 CPU cores and 24 GB of memory are available
N: 12
# FIXME: Temporarily use LDC until a release with a fix for issue 22942 is available (probably 2.101)
HOST_DMD: ldc
matrix: matrix:
- 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
<< : *COMMON_STEPS_TEMPLATE << : *COMMON_STEPS_TEMPLATE
macos11_task: macos12_task:
name: macOS 11.x x64, DMD (bootstrap) name: macOS 12.x x64 (M1), DMD (bootstrap)
osx_instance: macos_instance:
image: big-sur-xcode image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
timeout_in: 60m timeout_in: 60m
environment: environment:
OS_NAME: darwin OS_NAME: darwin
# override Cirrus default OS (`darwin`) # override Cirrus default OS (`darwin`)
OS: osx 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://github.com/dlang/dmd/pull/13890
HOST_DMD: dmd-2.088.0 HOST_DMD: dmd-2.099.1
<< : *COMMON_STEPS_TEMPLATE << : *COMMON_STEPS_TEMPLATE
# FreeBSD # FreeBSD

5
compiler/test/Makefile
View file

@ -142,6 +142,11 @@ ifneq ($(N),)
EXECUTE_RUNNER:=$(EXECUTE_RUNNER) --jobs=$N EXECUTE_RUNNER:=$(EXECUTE_RUNNER) --jobs=$N
endif endif
# Workaround https://issues.dlang.org/show_bug.cgi?id=23517
ifeq (osx,$(OS))
export MACOSX_DEPLOYMENT_TARGET=11
endif
ifeq (windows,$(OS)) ifeq (windows,$(OS))
all: all:
echo "Windows builds have been disabled" echo "Windows builds have been disabled"

5
druntime/test/common.mak
View file

@ -18,6 +18,11 @@ ifneq (default,$(MODEL))
MODEL_FLAG:=-m$(MODEL) MODEL_FLAG:=-m$(MODEL)
endif endif
CFLAGS_BASE:= $(MODEL_FLAG) $(PIC) -Wall CFLAGS_BASE:= $(MODEL_FLAG) $(PIC) -Wall
ifeq (osx,$(OS))
ifeq (64,$(MODEL))
CFLAGS_BASE+=--target=x86_64-darwin-apple # ARM cpu is not supported by dmd
endif
endif
DFLAGS:=$(MODEL_FLAG) $(PIC) -w -I../../src -I../../import -I$(SRC) -defaultlib= -debuglib= -preview=dip1000 -L-lpthread -L-lm $(LINKDL) DFLAGS:=$(MODEL_FLAG) $(PIC) -w -I../../src -I../../import -I$(SRC) -defaultlib= -debuglib= -preview=dip1000 -L-lpthread -L-lm $(LINKDL)
# LINK_SHARED may be set by importing makefile # LINK_SHARED may be set by importing makefile
DFLAGS+=$(if $(LINK_SHARED),-L$(DRUNTIMESO),-L$(DRUNTIME)) DFLAGS+=$(if $(LINK_SHARED),-L$(DRUNTIMESO),-L$(DRUNTIME))