Stop specifying a specific OpenSSL installation

This seems to be a relic from when M1 builds were new and consequently less well-supported. Going to attempt to go to latest now and see if our CI is amenable.
apollographql · Oct 25, 2024 · 3053154 · 3053154
1 parent 257f55e
commit 3053154
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -530,8 +530,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@1
             - run:
                 name: Install p7zip
                 command: brew install p7zip

diff --git a/xtask/src/target.rs b/xtask/src/target.rs
@@ -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@1"))
                 .find(|x| x.exists())
                 .ok_or_else(|| {
                     anyhow!(
-                        "OpenSSL v1.1 is not installed. Please install with `brew install \
-                    openssl@1.1`"
+                        "OpenSSL is not installed. Please install with `brew install \
+                    openssl@1`"
                     )
                 })?;