Skip to content

Commit

Permalink
temporarily disable intel macos architecture (#532)
Browse files Browse the repository at this point in the history
This PR should be reverted once beta is released

---------

Co-authored-by: ApolloBot2 <[email protected]>
  • Loading branch information
clenfest and ApolloBot2 authored Jul 9, 2024
1 parent 58e31d3 commit 6c12a52
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ workflows:
name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>)
matrix:
parameters:
platform: [amd_ubuntu, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
platform: [amd_ubuntu, arm_ubuntu, amd_linux, arm_macos, amd_windows]
rust_channel: [stable]
command: [test]

Expand All @@ -63,7 +63,7 @@ workflows:
name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>)
matrix:
parameters:
platform: [amd_ubuntu, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
platform: [amd_ubuntu, arm_ubuntu, amd_linux, arm_macos, amd_windows]
rust_channel: [stable]
command: [test]
<<: *any_release
Expand All @@ -72,13 +72,12 @@ workflows:
name: Build and bundle release artifacts (<< matrix.platform >>)
matrix:
parameters:
platform: [amd_ubuntu, arm_ubuntu, amd_macos, arm_macos, amd_windows]
platform: [amd_ubuntu, arm_ubuntu, arm_macos, amd_windows]
rust_channel: [stable]
command: [package]
requires:
- "Run cargo tests (stable rust on amd_ubuntu)"
- "Run cargo tests (stable rust on arm_ubuntu)"
- "Run cargo tests (stable rust on amd_macos)"
- "Run cargo tests (stable rust on arm_macos)"
- "Run cargo tests (stable rust on amd_windows)"
<<: *composition_release
Expand All @@ -91,7 +90,6 @@ workflows:
requires:
- "Build and bundle release artifacts (amd_ubuntu)"
- "Build and bundle release artifacts (arm_ubuntu)"
- "Build and bundle release artifacts (amd_macos)"
- "Build and bundle release artifacts (arm_macos)"
- "Build and bundle release artifacts (amd_windows)"
<<: *composition_release
Expand All @@ -104,7 +102,6 @@ workflows:
requires:
- "Run cargo tests (stable rust on amd_ubuntu)"
- "Run cargo tests (stable rust on arm_ubuntu)"
- "Run cargo tests (stable rust on amd_macos)"
- "Run cargo tests (stable rust on arm_macos)"
- "Run cargo tests (stable rust on amd_windows)"
<<: *crate_release
Expand Down Expand Up @@ -181,17 +178,6 @@ jobs:

# The machines we use to run our workflows on
executors:
amd_macos: &amd_macos_executor
macos:
xcode: "14.2"
resource_class: macos.m1.large.gen1
environment:
XTASK_TARGET: "x86_64-apple-darwin"
RUSTUP_TARGET: "x86_64-apple-darwin" # cross-compile, because there are no native x86 macos runners
APPLE_TEAM_ID: "YQK948L752"
APPLE_USERNAME: "[email protected]"
MACOS_PRIMARY_BUNDLE_ID: com.apollographql.supergraph

arm_macos: &arm_macos_executor
macos:
xcode: "14.2"
Expand Down Expand Up @@ -265,7 +251,6 @@ commands:
- when:
condition:
or:
- equal: [ *amd_macos_executor, << parameters.platform >> ]
- equal: [ *arm_macos_executor, << parameters.platform >> ]
steps:
- run:
Expand Down

0 comments on commit 6c12a52

Please sign in to comment.