Skip to content

Fixes and tweaks to the preview flow scripts: #7702

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

Merged
mmitche merged 1 commit into from
Aug 4, 2021
Merged

Fixes and tweaks to the preview flow scripts: #7702

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
12 changes: 9 additions & 3 deletions scripts/create-net6-preview-flow.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ MakeDefaultChannel https://github.com/mono/linker $RuntimeBranch $RuntimeChannel
if ($AddInternalFlow) {
# Because of where internal fixes tend to be, we eliminate some leaves in the graph
# and flow them through the normal public channels: emsdk, icu, linker.
# wpf-int gets assigned to the internal channel in addition (since there is no public->internal merge)
# wpf-int is flowed from the public channel (there is no internal branch or merge) due to
# an issue in the staging pipeline where it will give the test feed for the public preview build
# internal permissions in some cases because it sees the internal repo publishing locations before
# the public locations. The logic is such that if any asset has non-public permissions, the test feed will have
# internal permissions.
Write-Host "Making default channels for internal branches of runtime repos"
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeBranch $InternalRuntimeChannel
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch $InternalRuntimeChannel
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-efcore $InternalRuntimeBranch $InternalRuntimeChannel
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeBranch $InternalRuntimeChannel
Expand All @@ -86,6 +89,7 @@ if ($AddInternalFlow) {
Write-Host "Making default channels for SDK repos"
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-installer $InternalSdkBranch $InternalSdkChannel
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch $InternalSdkChannel
MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-templating $InternalSdkBranch $InternalSdkChannel
}

Write-Host "Setting up batched merge policies"
Expand Down Expand Up @@ -128,7 +132,6 @@ if ($AddInternalFlow) {
Write-Host "Adding internal runtime -> internal runtime flow"
AddBatchedFlow https://dev.azure.com/dnceng/internal/_git/dotnet-efcore $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch EveryBuild
AddBatchedFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf $InternalRuntimeBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-efcore $InternalRuntimeBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-winforms $InternalRuntimeBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-winforms $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf $InternalRuntimeBranch EveryBuild
Expand All @@ -142,13 +145,15 @@ Write-Host "Add runtime->sdk flow"
AddFlow https://github.com/dotnet/aspnetcore $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
AddFlow https://github.com/dotnet/windowsdesktop $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/templating $SdkBranch EveryBuild
AddFlow https://github.com/mono/linker $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild

if ($AddInternalFlow) {
Write-Host "Adding internal runtime->internal sdk flow"
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-templating $InternalSdkBranch EveryBuild

Write-Host "Disabling internal runtime->internal sdk flow"
DisableFlow $InternalRuntimeChannel
Expand All @@ -163,6 +168,7 @@ if ($AddInternalFlow) {
Write-Host "Adding internal sdk->internal sdk flow"
# Nothing but SDK->installer flows internally
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkChannel https://dev.azure.com/dnceng/internal/_git/dotnet-installer $InternalSdkBranch EveryBuild
AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-templating $InternalSdkChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild

Write-Host "Disabling internal sdk->internal sdk flow"
DisableFlow $InternalSdkChannel
Expand Down
8 changes: 4 additions & 4 deletions scripts/flip-previewplus-flow.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
param
(
[Parameter(Mandatory=$true)][string]"$RuntimeChannel",
[Parameter(Mandatory=$true)][string]"$SdkChannel",
[Parameter(Mandatory=$true)][string]"$InternalRuntimeChannel",
[Parameter(Mandatory=$true)][string]"$InternalSdkChannel",
[Parameter(Mandatory=$true)][string]$RuntimeChannel,
[Parameter(Mandatory=$true)][string]$SdkChannel,
[Parameter(Mandatory=$true)][string]$InternalRuntimeChannel,
[Parameter(Mandatory=$true)][string]$InternalSdkChannel,
[Parameter(Mandatory=$true)][ValidateSet('Preview','Preview+')][string]$FlowType,
[switch]$TriggerSubscriptions
)
Expand Down