From 6646cc7d4b786d52d81143be0ffc102bcfa3c513 Mon Sep 17 00:00:00 2001 From: Dylan Anthony Date: Mon, 22 Jul 2024 11:07:16 -0600 Subject: [PATCH] Don't install curl from Homebrew --- .circleci/config.yml | 71 ++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41afe183f..6a6064492 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ any_release: &any_release branches: ignore: /.*/ tags: - only : /(apollo-federation-types@v.*)|(router-bridge@v.*)|(composition@v.*)/ + only: /(apollo-federation-types@v.*)|(router-bridge@v.*)|(composition@v.*)/ # These filters are used to determine which package to release crate_release: &crate_release @@ -20,7 +20,7 @@ crate_release: &crate_release branches: ignore: /.*/ tags: - only : /(apollo-federation-types@v.*)|(router-bridge@v.*)/ + only: /(apollo-federation-types@v.*)|(router-bridge@v.*)/ # These filters are used to determine which package to release composition_release: &composition_release @@ -28,7 +28,7 @@ composition_release: &composition_release branches: ignore: /.*/ tags: - only : /(composition@v.*)/ + only: /(composition@v.*)/ parameters: # we can't easily pin on osx, and we chose not to on windows. @@ -44,25 +44,25 @@ workflows: name: Lint matrix: parameters: - platform: [amd_ubuntu] - rust_channel: [stable] - command: [lint] + platform: [ amd_ubuntu ] + rust_channel: [ stable ] + command: [ lint ] test: jobs: - xtask: 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] - rust_channel: [stable] - command: [test] - + platform: [ amd_ubuntu, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows ] + rust_channel: [ stable ] + command: [ test ] + - check_for_github_action: name: Check to ensure Github Action has completed successfully (<< matrix.platform >>) matrix: parameters: - platform: [amd_macos] - requires: + platform: [ amd_macos ] + requires: - "Run cargo tests (stable rust on amd_macos)" release: @@ -71,17 +71,17 @@ 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] - rust_channel: [stable] - command: [test] + platform: [ amd_ubuntu, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows ] + rust_channel: [ stable ] + command: [ test ] <<: *any_release - xtask: name: Build and bundle release artifacts (<< matrix.platform >>) matrix: parameters: - platform: [amd_ubuntu, arm_ubuntu, amd_macos, arm_macos, amd_windows] - rust_channel: [stable] - command: [package] + platform: [ amd_ubuntu, arm_ubuntu, amd_macos, 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)" @@ -94,16 +94,16 @@ workflows: name: Check to ensure Github Action has completed successfully (<< matrix.platform >>) matrix: parameters: - platform: [amd_macos] - requires: + platform: [ amd_macos ] + requires: - "Run cargo tests (stable rust on amd_macos)" <<: *any_release - + - publish_release: name: Publish to crates.io and create a GitHub release matrix: parameters: - platform: [minimal_linux] + platform: [ minimal_linux ] requires: - "Build and bundle release artifacts (amd_ubuntu)" - "Build and bundle release artifacts (arm_ubuntu)" @@ -117,7 +117,7 @@ workflows: name: Publish to crates.io matrix: parameters: - platform: [minimal_linux] + platform: [ minimal_linux ] requires: - "Run cargo tests (stable rust on amd_ubuntu)" - "Run cargo tests (stable rust on arm_ubuntu)" @@ -146,13 +146,13 @@ jobs: parameters: rust_channel: type: enum - enum: ["stable", "nightly"] + enum: [ "stable", "nightly" ] default: stable platform: type: executor command: type: enum - enum: [lint, test, publish, package, dist] + enum: [ lint, test, publish, package, dist ] options: type: string default: "" @@ -188,14 +188,14 @@ jobs: platform: << parameters.platform >> command: dist options: --debug - # this should be run before the GitHub release is created - # because it ensures that all of the files it needs - # are in place before proceeding. + # this should be run before the GitHub release is created + # because it ensures that all of the files it needs + # are in place before proceeding. - exec_xtask: platform: << parameters.platform >> command: publish - gh_release - + check_for_github_action: parameters: platform: @@ -271,7 +271,7 @@ commands: type: executor rust_channel: type: enum - enum: ["stable", "nightly"] + enum: [ "stable", "nightly" ] steps: - when: condition: @@ -296,13 +296,6 @@ commands: - run: name: Skip homebrew update command: echo "HOMEBREW_NO_AUTO_UPDATE=1" >> $BASH_ENV - - run: - name: Install curl - # we need to override the system curl because of outdated CA certificates - # on the base macos image - command: | - brew install curl - echo 'export PATH="/usr/local/opt/curl/bin:$PATH"' >> $BASH_ENV - run: name: Install CMake command: | @@ -385,7 +378,7 @@ commands: parameters: rust_channel: type: enum - enum: ["stable", "nightly"] + enum: [ "stable", "nightly" ] platform: type: executor steps: @@ -433,7 +426,7 @@ commands: parameters: command: type: enum - enum: [lint, test, publish, package, dist] + enum: [ lint, test, publish, package, dist ] options: type: string default: ""