Skip to content

Commit fdbc135

Browse files
authored
gh-144551: Update various CI jobs to OpenSSL 3.5 (GH-144808)
Also includes a fix to the address sanitizer build to build the `_ssl` module against the expected OpenSSL build.
1 parent 7359bb8 commit fdbc135

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ jobs:
428428
needs: build-context
429429
if: needs.build-context.outputs.run-ubuntu == 'true'
430430
env:
431-
OPENSSL_VER: 3.0.18
431+
OPENSSL_VER: 3.5.5
432432
PYTHONSTRICTEXTENSIONBUILD: 1
433433
steps:
434434
- uses: actions/checkout@v6
@@ -539,7 +539,7 @@ jobs:
539539
matrix:
540540
os: [ubuntu-24.04]
541541
env:
542-
OPENSSL_VER: 3.0.18
542+
OPENSSL_VER: 3.5.5
543543
PYTHONSTRICTEXTENSIONBUILD: 1
544544
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
545545
steps:
@@ -574,7 +574,7 @@ jobs:
574574
run: |
575575
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
576576
- name: Configure CPython
577-
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
577+
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc --with-openssl="$OPENSSL_DIR"
578578
- name: Build CPython
579579
run: make -j4
580580
- name: Display build info

.github/workflows/reusable-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
3636
- name: Install Homebrew dependencies
3737
run: |
38-
brew install pkg-config openssl@3.0 xz gdbm tcl-tk@9 make
38+
brew install pkg-config openssl@3.5 xz gdbm tcl-tk@9 make
3939
# Because alternate versions are not symlinked into place by default:
4040
brew link --overwrite tcl-tk@9
4141
- name: Configure CPython
@@ -50,7 +50,7 @@ jobs:
5050
--enable-safety \
5151
${{ inputs.free-threading && '--disable-gil' || '' }} \
5252
--prefix=/opt/python-dev \
53-
--with-openssl="$(brew --prefix openssl@3.0)"
53+
--with-openssl="$(brew --prefix openssl@3.5)"
5454
- name: Build CPython
5555
if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
5656
run: gmake -j8

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ${{ inputs.os }}
2828
timeout-minutes: 60
2929
env:
30-
OPENSSL_VER: 3.0.18
30+
OPENSSL_VER: 3.5.5
3131
PYTHONSTRICTEXTENSIONBUILD: 1
3232
TERM: linux
3333
steps:

0 commit comments

Comments
 (0)