Skip to content

Commit e07b304

Browse files
gh-101981: Consolidate macOS configure steps in CI (GH-102131)
Automerge-Triggered-By: GH:erlend-aasland
1 parent c3a1783 commit e07b304

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.github/workflows/build.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,11 @@ jobs:
162162
- uses: actions/checkout@v3
163163
- name: Install Homebrew dependencies
164164
run: brew install pkg-config openssl@1.1 xz gdbm tcl-tk
165-
- name: Prepare Homebrew environment variables
166-
run: |
167-
echo "CFLAGS=-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" >> $GITHUB_ENV
168-
echo "LDFLAGS=-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" >> $GITHUB_ENV
169-
echo "PKG_CONFIG_PATH=$(brew --prefix openssl@1.1)/lib/pkgconfig:$(brew --prefix tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV
170165
- name: Configure CPython
171166
run: |
167+
CFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \
168+
LDFLAGS="-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" \
169+
PKG_CONFIG_PATH="$(brew --prefix tcl-tk)/lib/pkgconfig" \
172170
./configure \
173171
--with-pydebug \
174172
--prefix=/opt/python-dev \

0 commit comments

Comments
 (0)