From 5d66946c06d50239763fd8d6e7099e6fd4a69d31 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Fri, 17 Feb 2023 23:28:14 +0900 Subject: [PATCH 1/4] gh-101981: Update macOS workflow --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97ea2d94598e2c..4b0fde44c71db5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,10 +159,12 @@ jobs: - uses: actions/checkout@v3 - name: Prepare homebrew environment variables run: | - echo "LDFLAGS=-L$(brew --prefix tcl-tk)/lib" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=$(brew --prefix openssl@1.1)/lib/pkgconfig:$(brew --prefix tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV + brew install pkg-config openssl@1.1 xz gdbm tcl-tk + 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 tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV - name: Configure CPython - run: ./configure --with-pydebug --prefix=/opt/python-dev + run: ./configure --with-pydebug --prefix=/opt/python-dev --with-openssl=$(brew --prefix openssl) - name: Build CPython run: make -j4 - name: Display build info From 9a72bf08b9d77b3ac606b6864b08cc0f72b97d48 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Sat, 18 Feb 2023 01:37:58 +0900 Subject: [PATCH 2/4] Address code review --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b0fde44c71db5..eda71f6d61f919 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: echo "LDFLAGS=-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=$(brew --prefix tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV - name: Configure CPython - run: ./configure --with-pydebug --prefix=/opt/python-dev --with-openssl=$(brew --prefix openssl) + run: ./configure --with-pydebug --with-openssl=$(brew --prefix openssl@1.1) - name: Build CPython run: make -j4 - name: Display build info From 28c8fa302a73a838d013e9dd5a75b2faa93f7d67 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Sat, 18 Feb 2023 10:28:42 +0900 Subject: [PATCH 3/4] Address code review --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eda71f6d61f919..72573e3d6fc8a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,11 +160,8 @@ jobs: - name: Prepare homebrew environment variables run: | brew install pkg-config openssl@1.1 xz gdbm tcl-tk - 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 tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV - name: Configure CPython - run: ./configure --with-pydebug --with-openssl=$(brew --prefix openssl@1.1) + 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 --with-openssl=$(brew --prefix openssl@1.1) - name: Build CPython run: make -j4 - name: Display build info From ca979d3ddb9201c10fcd72b870b93d24e45d04ec Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Sat, 18 Feb 2023 16:57:44 +0900 Subject: [PATCH 4/4] temporal fix --- Lib/test/test_tools/test_freeze.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/test/test_tools/test_freeze.py b/Lib/test/test_tools/test_freeze.py index 2ba36ca208f967..e833a4c26c7f73 100644 --- a/Lib/test/test_tools/test_freeze.py +++ b/Lib/test/test_tools/test_freeze.py @@ -8,6 +8,8 @@ from test.support import os_helper from test.test_tools import imports_under_tool, skip_if_missing + +support.requires('extralargefile','test requires extra disk spaces and a long time to run') skip_if_missing('freeze') with imports_under_tool('freeze', 'test'): import freeze as helper