mirror of https://github.com/python/cpython
[3.13] gh-123418: Update CI to use fresh OpenSSL releases (GH-123696)
Also adds openssl/openssl GitHub URL template for newer OpenSSL downloads
(cherry picked from commit 56b00f4705
)
Co-authored-by: Zachary Ware <zach@python.org>
This commit is contained in:
parent
9193d2957f
commit
e3b4564f6c
|
@ -245,7 +245,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
|
openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
|
||||||
env:
|
env:
|
||||||
OPENSSL_VER: ${{ matrix.openssl_ver }}
|
OPENSSL_VER: ${{ matrix.openssl_ver }}
|
||||||
MULTISSL_DIR: ${{ github.workspace }}/multissl
|
MULTISSL_DIR: ${{ github.workspace }}/multissl
|
||||||
|
@ -309,7 +309,7 @@ jobs:
|
||||||
needs: check_source
|
needs: check_source
|
||||||
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
|
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
|
||||||
env:
|
env:
|
||||||
OPENSSL_VER: 3.0.13
|
OPENSSL_VER: 3.0.15
|
||||||
PYTHONSTRICTEXTENSIONBUILD: 1
|
PYTHONSTRICTEXTENSIONBUILD: 1
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@ -422,7 +422,7 @@ jobs:
|
||||||
needs: check_source
|
needs: check_source
|
||||||
if: needs.check_source.outputs.run_tests == 'true'
|
if: needs.check_source.outputs.run_tests == 'true'
|
||||||
env:
|
env:
|
||||||
OPENSSL_VER: 3.0.13
|
OPENSSL_VER: 3.0.15
|
||||||
PYTHONSTRICTEXTENSIONBUILD: 1
|
PYTHONSTRICTEXTENSIONBUILD: 1
|
||||||
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
|
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -17,7 +17,7 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
env:
|
env:
|
||||||
FORCE_COLOR: 1
|
FORCE_COLOR: 1
|
||||||
OPENSSL_VER: 3.0.13
|
OPENSSL_VER: 3.0.15
|
||||||
PYTHONSTRICTEXTENSIONBUILD: 1
|
PYTHONSTRICTEXTENSIONBUILD: 1
|
||||||
TERM: linux
|
TERM: linux
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Update GitHub CI workflows to use OpenSSL 3.0.15 and multissltests to use
|
||||||
|
3.0.15, 3.1.7, and 3.2.3.
|
|
@ -47,9 +47,9 @@ OPENSSL_OLD_VERSIONS = [
|
||||||
|
|
||||||
OPENSSL_RECENT_VERSIONS = [
|
OPENSSL_RECENT_VERSIONS = [
|
||||||
"1.1.1w",
|
"1.1.1w",
|
||||||
"3.0.13",
|
"3.0.15",
|
||||||
"3.1.5",
|
"3.1.7",
|
||||||
"3.2.1",
|
"3.2.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
LIBRESSL_OLD_VERSIONS = [
|
LIBRESSL_OLD_VERSIONS = [
|
||||||
|
@ -397,6 +397,7 @@ class AbstractBuilder(object):
|
||||||
class BuildOpenSSL(AbstractBuilder):
|
class BuildOpenSSL(AbstractBuilder):
|
||||||
library = "OpenSSL"
|
library = "OpenSSL"
|
||||||
url_templates = (
|
url_templates = (
|
||||||
|
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
|
||||||
"https://www.openssl.org/source/openssl-{v}.tar.gz",
|
"https://www.openssl.org/source/openssl-{v}.tar.gz",
|
||||||
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
|
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
|
||||||
)
|
)
|
||||||
|
@ -439,6 +440,7 @@ class BuildOpenSSL(AbstractBuilder):
|
||||||
parsed = parsed[:2]
|
parsed = parsed[:2]
|
||||||
return ".".join(str(i) for i in parsed)
|
return ".".join(str(i) for i in parsed)
|
||||||
|
|
||||||
|
|
||||||
class BuildLibreSSL(AbstractBuilder):
|
class BuildLibreSSL(AbstractBuilder):
|
||||||
library = "LibreSSL"
|
library = "LibreSSL"
|
||||||
url_templates = (
|
url_templates = (
|
||||||
|
|
Loading…
Reference in New Issue