Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move Homebrew dependencies into Brewfile
  • Loading branch information
hugovk committed Apr 10, 2026
commit 2b3642954337e9610285581850026167e526708e
6 changes: 6 additions & 0 deletions .github/workflows/Brewfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
brew "gdbm"
brew "make"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to install a third-party make? We've always just used the Apple-supplied one as shown in the devguide.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, let's see...

It was added in #123020 because BSD make (the macOS default) was found to have a race condition when writing output to file across multiple jobs. We needed the output file to postprocess warnings.

And GNU make (from Homebrew, executable gmake) has --output-sync which prevents this race.

See resolved comment thread at #123020 (comment).

So we can move make out of the Brewfile, because we don't want that as part of the devguide recommendation, and do keep regular brew install make on CI.

brew "openssl@3.5"
brew "pkg-config"
brew "tcl-tk"
Comment thread
hugovk marked this conversation as resolved.
Outdated
brew "xz"
2 changes: 1 addition & 1 deletion .github/workflows/reusable-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
- name: Install Homebrew dependencies
run: |
brew install pkg-config openssl@3.5 xz gdbm tcl-tk@9 make
brew bundle --file=.github/workflows/Brewfile
# Because alternate versions are not symlinked into place by default:
brew link --overwrite tcl-tk@9

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will backport to 3.10, but we still need to link tcl-tk@8 there. And put tcl-tk@8 in the Brewfile.

- name: Configure CPython
Expand Down
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ repos:
exclude: Lib/test/tokenizedata/coding20731.py
- id: end-of-file-fixer
files: '^\.github/CODEOWNERS$'
- id: file-contents-sorter
files: '^\.github/workflows/Brewfile$'
- id: trailing-whitespace
types_or: [c, inc, python, rst, yaml]
- id: trailing-whitespace
Expand Down