Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SHA1 workarounds from VMR build #16774

Merged
merged 1 commit into from
Jun 22, 2023
+0 −22
Merged

Remove SHA1 workarounds from VMR build #16774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions eng/pipelines/templates/jobs/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ parameters:
- name: buildFromArchive
type: boolean

# Some distros like CentOS Stream 9 use OpenSSL 3.0 which disables SHA1 signing.
# This option overrides that default configuration and enables it. See https://github.com/dotnet/installer/pull/15289
- name: overrideDistroDisablingSha1
type: boolean
default: false

# Use the previous version's SDK to build the current one
- name: withPreviousSDK
type: boolean
Expand Down Expand Up @@ -204,11 +198,6 @@ jobs:
customRunArgs="$customRunArgs --network none"
fi

# See https://github.com/dotnet/source-build/issues/3202
if [[ '${{ parameters.overrideDistroDisablingSha1 }}' == 'True' ]]; then
customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1"
fi

if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then
customBuildArgs="$customBuildArgs --poison"
fi
Expand Down
11 changes: 0 additions & 11 deletions eng/pipelines/templates/stages/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ stages:
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
overrideDistroDisablingSha1: false # 🚫
runOnline: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -104,7 +103,6 @@ stages:
buildFromArchive: false # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -122,7 +120,6 @@ stages:
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
overrideDistroDisablingSha1: false # 🚫
runOnline: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅
Expand All @@ -140,7 +137,6 @@ stages:
buildFromArchive: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -158,7 +154,6 @@ stages:
buildFromArchive: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫
Expand All @@ -176,7 +171,6 @@ stages:
buildFromArchive: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
overrideDistroDisablingSha1: true # ✅
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -194,7 +188,6 @@ stages:
buildFromArchive: true # ✅
enablePoison: true # ✅
excludeOmniSharpTests: false # 🚫
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -212,7 +205,6 @@ stages:
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -230,7 +222,6 @@ stages:
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -250,7 +241,6 @@ stages:
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand All @@ -269,7 +259,6 @@ stages:
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
overrideDistroDisablingSha1: false # 🚫
runOnline: false # 🚫
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
Expand Down