From 0d83897ac7589ddd2a249d8046b8444b8a53a0ca Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Wed, 5 Mar 2025 09:12:16 -0500 Subject: [PATCH 1/2] fix(ci): install rust toolchain for macos nightly targets --- scripts/environment/bootstrap-macos.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/environment/bootstrap-macos.sh b/scripts/environment/bootstrap-macos.sh index 32a8fd528e1f0..227da63b535c9 100755 --- a/scripts/environment/bootstrap-macos.sh +++ b/scripts/environment/bootstrap-macos.sh @@ -14,6 +14,8 @@ brew install ruby@3 coreutils cue-lang/tap/cue protobuf # TODO(jszwedko): It's possible GHA just needs to update its images and this won't be needed in the # future brew reinstall rustup +rustup show active-toolchain || rustup toolchain install +rustup show gem install bundler From 8aaa07d8e593339be264934ca976e3e095508e06 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Wed, 5 Mar 2025 09:46:10 -0500 Subject: [PATCH 2/2] more elegant fix --- .github/workflows/publish.yml | 6 +++++- scripts/environment/bootstrap-macos.sh | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9431a943971ce..2ae2270058373 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -297,7 +297,11 @@ jobs: with: ref: ${{ inputs.git_ref }} - name: Bootstrap runner environment (macOS-specific) - run: bash scripts/environment/bootstrap-macos.sh + run: | + bash scripts/environment/bootstrap-macos.sh + # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain. + rustup show active-toolchain || rustup toolchain install + rustup show - name: Build Vector env: TARGET: "${{ matrix.architecture }}-apple-darwin" diff --git a/scripts/environment/bootstrap-macos.sh b/scripts/environment/bootstrap-macos.sh index 227da63b535c9..32a8fd528e1f0 100755 --- a/scripts/environment/bootstrap-macos.sh +++ b/scripts/environment/bootstrap-macos.sh @@ -14,8 +14,6 @@ brew install ruby@3 coreutils cue-lang/tap/cue protobuf # TODO(jszwedko): It's possible GHA just needs to update its images and this won't be needed in the # future brew reinstall rustup -rustup show active-toolchain || rustup toolchain install -rustup show gem install bundler