From 344fa1d3cfd58e9a5384d7b099faec51781fd312 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 9 Jun 2023 00:27:22 +0200 Subject: [PATCH 1/5] CI: Bump macOS build to use OpenSSL v3.0 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aa3b403c73aac..2c823c887e8cd4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -232,7 +232,7 @@ jobs: path: config.cache key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} - name: Install Homebrew dependencies - run: brew install pkg-config openssl@1.1 xz gdbm tcl-tk + run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk - name: Configure CPython run: | CFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \ @@ -242,7 +242,7 @@ jobs: --config-cache \ --with-pydebug \ --prefix=/opt/python-dev \ - --with-openssl="$(brew --prefix openssl@1.1)" + --with-openssl="$(brew --prefix openssl@3.0)" - name: Build CPython run: make -j4 - name: Display build info From 21a31cb3acfe321e69a89e9453f8e0117d554f9c Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 9 Jun 2023 07:05:44 +0200 Subject: [PATCH 2/5] Explicitly upgrade Homebrew openssl@3.0 --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4760c07a6d9cbb..ef715488a236e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -233,6 +233,8 @@ jobs: key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} - name: Install Homebrew dependencies run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk + - name: Upgrade Homebrew OpenSSL to the most recent version + run: brew upgrade openssl@3.0 - name: Configure CPython run: | GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \ From 499db46f48504416c05a460dc92354e3ad3cd575 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 9 Jun 2023 07:14:36 +0200 Subject: [PATCH 3/5] Use auto-update instead --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef715488a236e3..2baed811009fce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,7 +221,6 @@ jobs: if: needs.check_source.outputs.run_tests == 'true' env: HOMEBREW_NO_ANALYTICS: 1 - HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1 PYTHONSTRICTEXTENSIONBUILD: 1 steps: @@ -233,8 +232,6 @@ jobs: key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} - name: Install Homebrew dependencies run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk - - name: Upgrade Homebrew OpenSSL to the most recent version - run: brew upgrade openssl@3.0 - name: Configure CPython run: | GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \ From 2fe1ad313c576ba4c8f96b180c8c62ae52c183d6 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 9 Jun 2023 07:25:50 +0200 Subject: [PATCH 4/5] Revert "Use auto-update instead" This reverts commit 499db46f48504416c05a460dc92354e3ad3cd575. --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2baed811009fce..ef715488a236e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,6 +221,7 @@ jobs: if: needs.check_source.outputs.run_tests == 'true' env: HOMEBREW_NO_ANALYTICS: 1 + HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1 PYTHONSTRICTEXTENSIONBUILD: 1 steps: @@ -232,6 +233,8 @@ jobs: key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} - name: Install Homebrew dependencies run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk + - name: Upgrade Homebrew OpenSSL to the most recent version + run: brew upgrade openssl@3.0 - name: Configure CPython run: | GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \ From d634b2527bd83efb44eb0255aecd0445513900db Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 10 Jun 2023 22:45:52 +0200 Subject: [PATCH 5/5] Revert 'brew upgrade' since it did not work --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef715488a236e3..4760c07a6d9cbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -233,8 +233,6 @@ jobs: key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} - name: Install Homebrew dependencies run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk - - name: Upgrade Homebrew OpenSSL to the most recent version - run: brew upgrade openssl@3.0 - name: Configure CPython run: | GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \