Skip to content

Commit

Permalink
CNX-9674 CNX-9673: Stop using intel mac images on CircleCI (#3449)
Browse files Browse the repository at this point in the history
* ci: Upgrade to m1 macs

* ci: Bump xcode version accordingly

* fix: try with lower xcode

* fix(ci): Install rosetta in m1 machines

* fix(ci): Missing mac orb
  • Loading branch information
AlanRynne authored May 30, 2024
1 parent b2f9f49 commit 88257b8
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions .circleci/scripts/config-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ orbs:
wait-for: cobli/[email protected]
discord: antonioned/[email protected]
docker: circleci/[email protected]

macos: circleci/[email protected]
# The main workflows for our monorepo pipeline.

workflows:
Expand Down Expand Up @@ -274,7 +274,8 @@ jobs: # Each project will have individual jobs for each specific task it has to

build-connector-mac:
macos:
xcode: 12.5.1
xcode: 13.4.1
resource_class: macos.m1.medium.gen1
parameters:
slnname:
type: string
Expand Down Expand Up @@ -303,6 +304,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
type: string
default: ""
steps:
- macos/install-rosetta
- cached-checkout
- attach_workspace:
at: ./
Expand Down Expand Up @@ -581,7 +583,8 @@ jobs: # Each project will have individual jobs for each specific task it has to

build-archicad-add-on-mac: # build Archicad C++ add-on
macos:
xcode: 12.5.1
xcode: 13.4.1
resource_class: macos.m1.medium.gen1
parameters:
archicadversion:
type: string
Expand All @@ -593,6 +596,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
type: string
default: ""
steps:
- macos/install-rosetta
- cached-checkout
- attach_workspace:
at: ./
Expand Down

0 comments on commit 88257b8

Please sign in to comment.