From 430d23b17bfa7395d0179d65ce8b76f5545647b5 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 18 Apr 2025 13:26:13 -0400 Subject: [PATCH 1/5] Update build.yml --- .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 19cb8db0..b227798d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -298,7 +298,7 @@ jobs: export CFLAGS=-DNO_INTERLOCKEDOR64 fi # --libdir=lib is needed so Python can find OpenSSL libraries - "${PERL}" ./Configure "${openssl_arch}" --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS + "${PERL}" ./Configure --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS - name: Rename GNU link on Windows if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true' From c7f9303f58c028d41acbd7adf8a004ccf071b603 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 18 Apr 2025 13:34:55 -0400 Subject: [PATCH 2/5] [no ci] remove ref to openssl_arch --- .github/workflows/build.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b227798d..e13c34b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,49 +39,38 @@ jobs: - os: ubuntu-22.04 jid: 1 goal: build - openssl_archs: linux-x86_64 - os: ubuntu-24.04 jid: 2 goal: build - openssl_archs: linux-x86_64 - os: ubuntu-24.04-arm jid: 3 goal: build - openssl_archs: linux-aarch64 - os: ubuntu-22.04-arm jid: 4 goal: build - openssl_archs: linux-aarch64 - os: ubuntu-22.04 jid: 5 goal: build - openssl_archs: linux-x86_64 staticx: yes - os: ubuntu-22.04-arm jid: 6 goal: build - openssl_archs: linux-aarch64 staticx: yes - os: macos-13 jid: 7 goal: build - openssl_archs: darwin64-x86_64 - os: macos-14 jid: 8 goal: build - openssl_archs: darwin64-arm64 - os: macos-15 jid: 9 goal: build - openssl_archs: darwin64-arm64 - os: windows-2022 jid: 10 goal: build - openssl_archs: VC-WIN64A - os: windows-11-arm jid: 11 goal: build - openssl_archs: VC-WIN64-ARM - os: ubuntu-24.04 goal: test python: "3.10" @@ -225,7 +214,6 @@ jobs: - name: Set Env Variables for build if: matrix.goal == 'build' env: - openssl_archs: ${{ matrix.openssl_archs }} staticx: ${{ matrix.staticx }} run: | echo "We are running on ${RUNNER_OS}" @@ -270,7 +258,6 @@ jobs: echo "MAKEOPT=${MAKEOPT}" >> $GITHUB_ENV echo "PERL=${PERL}" >> $GITHUB_ENV echo "PYEXTERNALS_PATH=${PYEXTERNALS_PATH}" >> $GITHUB_ENV - echo "openssl_archs=${openssl_archs}" >> $GITHUB_ENV - name: Get latest stable OpenSSL source if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' From 0f0eaa40b8e3540f5a6796a6a20c9128946b89e6 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 18 Apr 2025 13:43:10 -0400 Subject: [PATCH 3/5] [no ci] nicer names to build jobs --- .github/workflows/build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e13c34b7..7eade307 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,54 +39,69 @@ jobs: - os: ubuntu-22.04 jid: 1 goal: build + name: Build Intel Ubuntu Jammy - os: ubuntu-24.04 jid: 2 goal: build + name: Build Intel Ubuntu Noble - os: ubuntu-24.04-arm jid: 3 goal: build + name: Build Arm Ubuntu Noble - os: ubuntu-22.04-arm jid: 4 goal: build + name: Build Arm Ubuntu Jammy - os: ubuntu-22.04 jid: 5 goal: build staticx: yes + name: Build Intel StaticX Legacy - os: ubuntu-22.04-arm jid: 6 goal: build staticx: yes + name: Build Arm StaticX Legacy - os: macos-13 jid: 7 goal: build + name: Build Intel MacOS - os: macos-14 jid: 8 goal: build + name: Build Arm MacOS 14 - os: macos-15 jid: 9 goal: build + name: Build Arm MacOS 15 - os: windows-2022 jid: 10 goal: build + name: Build Intel Windows - os: windows-11-arm jid: 11 goal: build + name: Build Arm Windows - os: ubuntu-24.04 goal: test python: "3.10" jid: 12 + name: Test Python 3.10 - os: ubuntu-24.04 goal: test python: "3.11" jid: 13 + name: Test Python 3.11 - os: ubuntu-24.04 goal: test python: "3.12" jid: 14 + name: Test Python 3.12 - os: ubuntu-24.04 goal: test python: "3.14-dev" jid: 15 + name: Test Python 3.14-dev steps: From 613aff99e22f3576f8105c2d10e8b08991814e60 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 18 Apr 2025 13:56:11 -0400 Subject: [PATCH 4/5] [no ci] improved job names --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7eade307..3d3112dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,22 +86,22 @@ jobs: goal: test python: "3.10" jid: 12 - name: Test Python 3.10 + name: Test Python ${{ matrix.python }} - os: ubuntu-24.04 goal: test python: "3.11" jid: 13 - name: Test Python 3.11 + name: Test Python ${{ matrix.python }} - os: ubuntu-24.04 goal: test python: "3.12" jid: 14 - name: Test Python 3.12 + name: Test Python ${{ matrix.python }} - os: ubuntu-24.04 goal: test python: "3.14-dev" jid: 15 - name: Test Python 3.14-dev + name: Test Python ${{ matrix.python }} steps: From 41b1ce50da5c13b644a1c499cdc7ae9ed0bf2dc9 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 18 Apr 2025 14:18:58 -0400 Subject: [PATCH 5/5] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d3112dd..7eade307 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,22 +86,22 @@ jobs: goal: test python: "3.10" jid: 12 - name: Test Python ${{ matrix.python }} + name: Test Python 3.10 - os: ubuntu-24.04 goal: test python: "3.11" jid: 13 - name: Test Python ${{ matrix.python }} + name: Test Python 3.11 - os: ubuntu-24.04 goal: test python: "3.12" jid: 14 - name: Test Python ${{ matrix.python }} + name: Test Python 3.12 - os: ubuntu-24.04 goal: test python: "3.14-dev" jid: 15 - name: Test Python ${{ matrix.python }} + name: Test Python 3.14-dev steps: