chore(ci): remove 'unset HOMEBREW_NO_INSTALL_FROM_API' line (#21787)

* chore(ci): remove HOMEBREW_NO_INSTALL_FROM_API * add missing perms
vectordotdev · Nov 13, 2024 · b32ea2f · b32ea2f
1 parent 9fa3516
commit b32ea2f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml
@@ -19,6 +19,9 @@ on:
   merge_group:
     types: [checks_requested]
 
+permissions:
+  statuses: write
+
 concurrency:
   # `github.ref` is unique for MQ runs and PRs
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -281,7 +281,7 @@ jobs:
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (macOS-specific)
-        run: bash scripts/environment/bootstrap-macos-10.sh
+        run: bash scripts/environment/bootstrap-macos.sh
       - name: Build Vector
         env:
           TARGET: "x86_64-apple-darwin"

diff --git a/.github/workflows/unit_mac.yml b/.github/workflows/unit_mac.yml
@@ -44,7 +44,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-
 
-      - run: bash scripts/environment/bootstrap-macos-10.sh
+      - run: bash scripts/environment/bootstrap-macos.sh
       - run: bash scripts/environment/prepare.sh
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - run: make test

diff --git a/scripts/environment/bootstrap-macos-10.sh → scripts/environment/bootstrap-macos.sh b/scripts/environment/bootstrap-macos-10.sh → scripts/environment/bootstrap-macos.sh
@@ -1,9 +1,6 @@
 #! /usr/bin/env bash
 set -e -o verbose
 
-# https://github.com/Homebrew/homebrew-cask/issues/150323
-unset HOMEBREW_NO_INSTALL_FROM_API
-
 brew update
 
 # `brew install` attempts to upgrade python as a dependency but fails