]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-101981: Consolidate macOS configure steps in CI (GH-102131)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 23 Feb 2023 17:12:13 +0000 (09:12 -0800)
committerGitHub <noreply@github.com>
Thu, 23 Feb 2023 17:12:13 +0000 (09:12 -0800)
(cherry picked from commit e07b304bb004e1298283c82bd135dd5ef96a90cc)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
Automerge-Triggered-By: GH:erlend-aasland
.github/workflows/build.yml

index 1686c172e2a385922bc2ad480aeb67ba625b9334..ac0dd2b84bb44b05bcdd409d752b848480113ef9 100644 (file)
@@ -182,13 +182,11 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install Homebrew dependencies
       run: brew install pkg-config openssl@1.1 xz gdbm tcl-tk
-    - name: Prepare Homebrew environment variables
-      run: |
-        echo "CFLAGS=-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" >> $GITHUB_ENV
-        echo "PKG_CONFIG_PATH=$(brew --prefix openssl@1.1)/lib/pkgconfig:$(brew --prefix tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV
     - name: Configure CPython
       run: |
+        CFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \
+        LDFLAGS="-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" \
+        PKG_CONFIG_PATH="$(brew --prefix tcl-tk)/lib/pkgconfig" \
         ./configure \
           --with-pydebug \
           --prefix=/opt/python-dev \