Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Azure & Cirrus CI: Bump macOS image to 11.x (Big Sur) [2] #3903

Closed
wants to merge 3 commits into from
Closed

Azure & Cirrus CI: Bump macOS image to 11.x (Big Sur) [2] #3903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1402d6d
Azure & Cirrus CI: Bump macOS image to 11.x (Big Sur)
kinke Nov 13, 2021
0f3f133
test
kinke Jan 17, 2022
735eaff
test2
kinke Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,13 @@ task:
<< : *COMMON_STEPS_TEMPLATE

task:
name: macOS 10.15 $TASK_NAME_SUFFIX
name: macOS 11.x $TASK_NAME_SUFFIX
osx_instance:
image: catalina-xcode
image: big-sur-xcode
timeout_in: 60m
environment:
CI_OS: osx
EXTRA_CMAKE_FLAGS: "-DD_COMPILER_FLAGS=-gcc=/usr/bin/cc"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this works, this is a good tip to add to the readme on how to build LDC on macOS.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a note in https://wiki.dlang.org/Building_LDC_from_source#Building_LDC_from_source.

LLVM_VERSION: 12.0.1
# OS is preset to `darwin`
OS: osx
Expand Down
13 changes: 8 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,16 @@ jobs:
- job: macOS_x64
timeoutInMinutes: 120
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-11'
variables:
CI_OS: osx
ARCH: x86_64
BOOTSTRAP_CMAKE_FLAGS: -DBUILD_LTO_LIBS=ON
BOOTSTRAP_CMAKE_FLAGS: >
-DBUILD_LTO_LIBS=ON
-DD_COMPILER_FLAGS="-gcc=/usr/bin/cc"
EXTRA_CMAKE_FLAGS: >
-DBUILD_LTO_LIBS=ON
-DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
-DD_COMPILER_FLAGS="-gcc=/usr/bin/cc -O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
-DEXTRA_CXXFLAGS=-flto=full
MACOSX_DEPLOYMENT_TARGET: 10.9
IOS_DEPLOYMENT_TARGET: 12.0
Expand All @@ -133,13 +135,14 @@ jobs:
- job: macOS_arm64
timeoutInMinutes: 120
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-11'
variables:
CI_OS: osx
ARCH: arm64
BOOTSTRAP_CMAKE_FLAGS: -DD_COMPILER_FLAGS="-gcc=/usr/bin/cc"
EXTRA_CMAKE_FLAGS: >
-DBUILD_LTO_LIBS=ON
-DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
-DD_COMPILER_FLAGS="-gcc=/usr/bin/cc -O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
-DEXTRA_CXXFLAGS=-flto=full
EXTRA_CMAKE_FLAGS_CROSS: -DCMAKE_OSX_ARCHITECTURES=arm64
MACOSX_DEPLOYMENT_TARGET: 11.0
Expand Down