Skip to content

Commit

Permalink
Fix macOS CI (#2238)
Browse files Browse the repository at this point in the history
Fixes: #2237

CI has been broken for Mac since Homebrew pulled support for OpenSSL at
the specific version we're requiring. However this appears to be a
holdover from older versions of MacOS where Rosetta etc. were less well
supported, so in moving this forward we _should_ be able to upgrade as
well.

Green Smoke Test run:
https://github.com/apollographql/rover/actions/runs/11515349122/job/32056173251
  • Loading branch information
jonathanrainer authored and glasser committed Dec 12, 2024
1 parent a6f6825 commit 598e517
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ executors:

amd_macos: &amd_macos_executor
macos:
xcode: "14.2"
xcode: "15.0.0"
resource_class: macos.m1.large.gen1
environment:
XTASK_TARGET: "x86_64-apple-darwin"
Expand All @@ -72,7 +72,7 @@ executors:
# until there is official support for building on real ARM Macs
arm_macos: &arm_macos_executor
macos:
xcode: "14.2"
xcode: "15.0.0"
resource_class: macos.m1.large.gen1
environment:
XTASK_TARGET: "aarch64-apple-darwin"
Expand Down Expand Up @@ -475,8 +475,8 @@ commands:
- equal: [*arm_macos_executor, << parameters.platform >>]
steps:
- run:
name: Install OpenSSL@1.1
command: brew install openssl@1.1
name: Install OpenSSL
command: brew install openssl@3
- run:
name: Install p7zip
command: brew install p7zip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
matrix:
compile_target:
- target: x86_64-apple-darwin
compiles_on: macos-14
compiles_on: macos-13-xlarge
- target: aarch64-apple-darwin
compiles_on: macos-14
compiles_on: macos-13-xlarge
- target: x86_64-pc-windows-msvc
compiles_on: windows-2022
- target: x86_64-unknown-linux-gnu
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-mac-x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build-rover:
name: Build Rover for macOS x86-64
# Arm64 runner for cross-compilation
runs-on: macos-14
runs-on: macos-13-xlarge
steps:
- uses: actions/checkout@v4
name: "Checkout rover repo"
Expand Down
6 changes: 3 additions & 3 deletions xtask/src/target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ impl Target {
} else if self.is_macos() {
let openssl_path = BREW_OPT
.iter()
.map(|x| Utf8Path::new(x).join("openssl@1.1"))
.map(|x| Utf8Path::new(x).join("openssl@3"))
.find(|x| x.exists())
.ok_or_else(|| {
anyhow!(
"OpenSSL v1.1 is not installed. Please install with `brew install \
openssl@1.1`"
"OpenSSL v3 is not installed. Please install with `brew install \
openssl@3`"
)
})?;

Expand Down

0 comments on commit 598e517

Please sign in to comment.