bpo-45007: Update to OpenSSL 1.1.1l in Windows build and CI (GH-28009)

This commit is contained in:
Steve Dower 2021-08-29 15:18:57 +01:00 committed by GitHub
parent 0897253f42
commit d3bdbbf9a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 23 deletions

View File

@ -1,14 +1,14 @@
variables: variables:
coverage: false coverage: false
trigger: ['main', '3.9', '3.8', '3.7'] trigger: ['main', '3.10', '3.9', '3.8', '3.7']
jobs: jobs:
- job: Prebuild - job: Prebuild
displayName: Pre-build checks displayName: Pre-build checks
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
steps: steps:
- template: ./prebuild-checks.yml - template: ./prebuild-checks.yml
@ -20,7 +20,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
steps: steps:
- template: ./docs-steps.yml - template: ./docs-steps.yml
@ -40,7 +40,7 @@ jobs:
testRunPlatform: macos testRunPlatform: macos
pool: pool:
vmImage: macos-10.14 vmImage: macos-10.15
steps: steps:
- template: ./macos-steps.yml - template: ./macos-steps.yml
@ -52,12 +52,12 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
variables: variables:
testRunTitle: '$(build.sourceBranchName)-linux' testRunTitle: '$(build.sourceBranchName)-linux'
testRunPlatform: linux testRunPlatform: linux
openssl_version: 1.1.1k openssl_version: 1.1.1l
steps: steps:
- template: ./posix-steps.yml - template: ./posix-steps.yml
@ -78,12 +78,12 @@ jobs:
) )
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
variables: variables:
testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
testRunPlatform: linux-coverage testRunPlatform: linux-coverage
openssl_version: 1.1.1k openssl_version: 1.1.1l
steps: steps:
- template: ./posix-steps.yml - template: ./posix-steps.yml

View File

@ -1,14 +1,14 @@
variables: variables:
coverage: false coverage: false
pr: ['main', '3.9', '3.8', '3.7'] pr: ['main', '3.10', '3.9', '3.8', '3.7']
jobs: jobs:
- job: Prebuild - job: Prebuild
displayName: Pre-build checks displayName: Pre-build checks
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
steps: steps:
- template: ./prebuild-checks.yml - template: ./prebuild-checks.yml
@ -20,7 +20,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
steps: steps:
- template: ./docs-steps.yml - template: ./docs-steps.yml
@ -38,7 +38,7 @@ jobs:
testRunPlatform: macos testRunPlatform: macos
pool: pool:
vmImage: macos-10.14 vmImage: macos-10.15
steps: steps:
- template: ./macos-steps.yml - template: ./macos-steps.yml
@ -52,12 +52,12 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
variables: variables:
testRunTitle: '$(system.pullRequest.TargetBranch)-linux' testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
testRunPlatform: linux testRunPlatform: linux
openssl_version: 1.1.1k openssl_version: 1.1.1l
steps: steps:
- template: ./posix-steps.yml - template: ./posix-steps.yml
@ -78,12 +78,12 @@ jobs:
) )
pool: pool:
vmImage: ubuntu-18.04 vmImage: ubuntu-20.04
variables: variables:
testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
testRunPlatform: linux-coverage testRunPlatform: linux-coverage
openssl_version: 1.1.1k openssl_version: 1.1.1l
steps: steps:
- template: ./posix-steps.yml - template: ./posix-steps.yml

View File

@ -138,7 +138,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: 1.1.1k OPENSSL_VER: 1.1.1l
PYTHONSTRICTEXTENSIONBUILD: 1 PYTHONSTRICTEXTENSIONBUILD: 1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -182,7 +182,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
openssl_ver: [1.1.1k, 3.0.0-beta1] openssl_ver: [1.1.1l, 3.0.0-beta1]
env: env:
OPENSSL_VER: ${{ matrix.openssl_ver }} OPENSSL_VER: ${{ matrix.openssl_ver }}
MULTISSL_DIR: ${{ github.workspace }}/multissl MULTISSL_DIR: ${{ github.workspace }}/multissl
@ -229,7 +229,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: 1.1.1k OPENSSL_VER: 1.1.1l
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:

View File

@ -0,0 +1 @@
Update to OpenSSL 1.1.1l in Windows build

View File

@ -53,7 +53,7 @@ echo.Fetching external libraries...
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1k if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1l
set libraries=%libraries% sqlite-3.35.5.0 set libraries=%libraries% sqlite-3.35.5.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0
@ -77,7 +77,7 @@ echo.Fetching external binaries...
set binaries= set binaries=
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.3.0 if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.3.0
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1k-1 if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1l
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06

View File

@ -63,8 +63,8 @@
<libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir> <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
<libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir> <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir> <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
<opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir> <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>