Skip to content

Commit fbeb7d4

Browse files
authored
chore(ci): drop Homebrew origin/main workaround for macOS runners (#8084)
## Notes GitHub Actions macOS runners now ship a Homebrew version (5.0.5) that includes the fix that was needed in a change, so it's possible to remove the temporary CI step that forced using brew from origin/main (added in #7680). Proof of macOS GitHub Actions coming packaged with 5.0.5 - latest commit on `main` (https://github.com/openai/codex/actions/runs/20245177832/job/58123247999) - <img width="1286" height="136" alt="image" src="https://github.com/user-attachments/assets/8b25fd57-dad5-45c5-907c-4f4da6a36c3f" /> `actions/runner-images` upgraded the macOS 14 image from pre-release to release today (https://github.com/actions/runner-images/releases/tag/macos-14-arm64%2F20251210.0045) - <img width="1076" height="793" alt="image" src="https://github.com/user-attachments/assets/357ea4bd-40b0-49c3-a6cd-e7d87ba6766d" />
1 parent 54def78 commit fbeb7d4

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

.github/workflows/rust-ci.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -385,28 +385,6 @@ jobs:
385385
/opt/ghc
386386
sudo apt-get remove -y docker.io docker-compose podman buildah
387387
388-
# Ensure brew includes this fix so that brew's shellenv.sh loads
389-
# cleanly in the Codex sandbox (it is frequently eval'd via .zprofile
390-
# for Brew users, including the macOS runners on GitHub):
391-
#
392-
# https://github.com/Homebrew/brew/pull/21157
393-
#
394-
# Once brew 5.0.5 is released and is the default on macOS runners, this
395-
# step can be removed.
396-
- name: Upgrade brew
397-
if: ${{ startsWith(matrix.runner, 'macos') }}
398-
shell: bash
399-
run: |
400-
set -euo pipefail
401-
brew --version
402-
git -C "$(brew --repo)" fetch origin
403-
git -C "$(brew --repo)" checkout main
404-
git -C "$(brew --repo)" reset --hard origin/main
405-
export HOMEBREW_UPDATE_TO_TAG=0
406-
brew update
407-
brew upgrade
408-
brew --version
409-
410388
# Some integration tests rely on DotSlash being installed.
411389
# See https://github.com/openai/codex/pull/7617.
412390
- name: Install DotSlash

0 commit comments

Comments
 (0)