Skip to content

CI: Move Homebrew dependencies into Brewfile #148335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugovk wants to merge 7 commits into
base: main
Choose a base branch
from
Open

CI: Move Homebrew dependencies into Brewfile #148335

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b36429
Move Homebrew dependencies into Brewfile
hugovk Apr 7, 2026
301147e
No need to link the default version
hugovk Apr 10, 2026
f54be75
Explicitly install tcl-tk9
hugovk Apr 10, 2026
f8abb34
@
hugovk Apr 10, 2026
c37c6da
Merge remote-tracking branch 'upstream/main' into 3.15-brewfile
hugovk Apr 12, 2026
3a804b8
Only install gmake from Homebrew on CI
hugovk Apr 12, 2026
b29865e
Add mpdecimal and zstd to Brewfile
hugovk Apr 12, 2026
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
6 changes: 6 additions & 0 deletions .github/workflows/Brewfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
brew "gdbm"
brew "make"
Copy link
Copy Markdown
Member

@ned-deily ned-deily Apr 11, 2026

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

@hugovk hugovk Apr 12, 2026

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@9"
brew "xz"
Copy link
Copy Markdown
Member

@ned-deily ned-deily Apr 11, 2026

Choose a reason for hiding this comment

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

What about mpdecimal and zstd?

Copy link
Copy Markdown
Member Author

@hugovk hugovk Apr 12, 2026

Choose a reason for hiding this comment

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

Looks like they are already part of the macOS runners, so we never had to add them.

But I'll add so we can recommend the Brewfile in the devguide.

4 changes: 1 addition & 3 deletions .github/workflows/reusable-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +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
# Because alternate versions are not symlinked into place by default:
brew link --overwrite tcl-tk@9
Copy link
Copy Markdown
Member Author

@hugovk hugovk Apr 10, 2026

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.

brew bundle --file=.github/workflows/Brewfile
- name: Configure CPython
run: |
MACOSX_DEPLOYMENT_TARGET=10.15 \
Expand Down
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
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
Loading