Add Manual OneBranch Release Stage & Publish Support (Internal/Public) #3761
+388
−70
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| ################################################################################# | ||
| # Licensed to the .NET Foundation under one or more agreements. # | ||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||
| # See the LICENSE file in the project root for more information. # | ||
| ################################################################################# | ||
| parameters: | ||
| - name: approvalAliases | ||
|
Contributor
There was a problem hiding this comment. I think we should be documenting all parameters. Nothing fancy, just a sentence or two about what a parameter does. |
||
| type: string | ||
| - name: publishDestination | ||
| type: string | ||
| - name: dryRun | ||
| type: boolean | ||
| - name: isPreview | ||
| type: boolean | ||
| - name: publishSymbols | ||
| type: boolean | ||
| - name: nugetPackageVersion | ||
| type: string | ||
| - name: product | ||
| type: string | ||
|
|
||
| jobs: | ||
| - job: AwaitApproval | ||
| displayName: 'Await Release Approval' | ||
| pool: server | ||
| steps: | ||
| - task: ManualValidation@0 | ||
| displayName: 'Manual Approval' | ||
| timeoutInMinutes: 4320 | ||
| inputs: | ||
| notifyUsers: ${{ parameters.approvalAliases }} | ||
| instructions: | | ||
| Release Checklist: | ||
| * Destination: ${{ parameters.publishDestination }} | ||
| * Preview build: ${{ parameters.isPreview }} | ||
| * Dry run: ${{ parameters.dryRun }} | ||
| * Symbols: ${{ parameters.publishSymbols }} | ||
| * NuGet package version: ${{ parameters.nugetPackageVersion }} | ||
| * Product: ${{ parameters.product }} | ||
| Approve to continue or Reject to abort. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| ################################################################################# | ||
| # Licensed to the .NET Foundation under one or more agreements. # | ||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||
| # See the LICENSE file in the project root for more information. # | ||
| ################################################################################# | ||
| parameters: | ||
| - name: publishDestination | ||
| type: string | ||
| - name: dryRun | ||
| type: boolean | ||
| - name: internalFeedSource | ||
| type: string | ||
| - name: publicNuGetSource | ||
| type: string | ||
| - name: publishSymbols | ||
| type: boolean | ||
| - name: packageFolderName | ||
| type: string | ||
| - name: nugetPackageVersion | ||
| type: string | ||
| - name: product | ||
| type: string | ||
|
|
||
| jobs: | ||
| - job: PublishPackages | ||
| displayName: 'Publish Packages' | ||
| dependsOn: AwaitApproval | ||
|
Contributor
There was a problem hiding this comment. Should the approval step just live in this file? Is approval really a general task? It seems pretty specific to publishing packages. |
||
| condition: succeeded() | ||
| pool: | ||
| vmImage: 'ubuntu-latest' | ||
| steps: | ||
| - task: DownloadPipelineArtifact@2 | ||
| displayName: 'Download Signed Packages' | ||
| inputs: | ||
| buildType: current | ||
| artifactName: ${{ parameters.packageFolderName }} | ||
| targetPath: $(Pipeline.Workspace)/release/packages | ||
| - script: | | ||
|
Contributor
There was a problem hiding this comment. Would it also be helpful to list the contents of |
||
| echo "NuGet Package Version: ${{ parameters.nugetPackageVersion }}" | ||
| displayName: 'Echo NuGet Package Version' | ||
| - template: ../steps/list-packages-step.yml | ||
| parameters: | ||
| path: $(Pipeline.Workspace)/release/packages | ||
| - ${{ if ne(parameters.publishDestination, 'Public') }}: | ||
| - template: ../steps/publish-internal-feed-step.yml | ||
| parameters: | ||
| dryRun: ${{ parameters.dryRun }} | ||
| internalFeedSource: ${{ parameters.internalFeedSource }} | ||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - ${{ if eq(parameters.publishDestination, 'Public') }}: | ||
|
Contributor
There was a problem hiding this comment. Prefer I would probably swap this to be: |
||
| - template: ../steps/publish-public-nuget-step.yml | ||
| parameters: | ||
| dryRun: ${{ parameters.dryRun }} | ||
| publicNuGetSource: ${{ parameters.publicNuGetSource }} | ||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - ${{ if parameters.publishSymbols }}: | ||
| - template: ../steps/publish-symbols-step.yml | ||
| parameters: | ||
| dryRun: ${{ parameters.dryRun }} | ||
cheenamalhotra marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| publishSymbols: ${{ parameters.publishSymbols }} | ||
| symbolsArtifactName: ${{ parameters.product }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.nugetPackageVersion }}_$(System.TimelineId) | ||
| product: ${{ parameters.product }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| ################################################################################# | ||
| # Licensed to the .NET Foundation under one or more agreements. # | ||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||
| # See the LICENSE file in the project root for more information. # | ||
| ################################################################################# | ||
| parameters: | ||
| - name: runRelease | ||
| type: boolean | ||
| - name: publishDestination | ||
| type: string | ||
| - name: dryRun | ||
| type: boolean | ||
| - name: approvalAliases | ||
| type: string | ||
| - name: internalFeedSource | ||
| type: string | ||
| - name: publicNuGetSource | ||
| type: string | ||
| - name: publishSymbols | ||
| type: boolean | ||
| - name: isPreview | ||
| type: boolean | ||
| - name: product | ||
| type: string | ||
| - name: nugetPackageVersion | ||
| type: string | ||
| - name: packageFolderName | ||
| type: string | ||
|
|
||
| stages: | ||
| - stage: releaseMDS | ||
| displayName: 'Release (Manual)' | ||
| condition: and(succeeded(), eq(variables['Build.Reason'],'Manual'), eq(${{ parameters.runRelease }}, true)) | ||
| jobs: | ||
| - template: ../jobs/approval-job.yml | ||
| parameters: | ||
| approvalAliases: ${{ parameters.approvalAliases }} | ||
| publishDestination: ${{ parameters.publishDestination }} | ||
| dryRun: ${{ parameters.dryRun }} | ||
| isPreview: ${{ parameters.isPreview }} | ||
| publishSymbols: ${{ parameters.publishSymbols }} | ||
| nugetPackageVersion: ${{ parameters.nugetPackageVersion }} | ||
| product: ${{ parameters.product }} | ||
| - template: ../jobs/publish-packages-job.yml | ||
| parameters: | ||
| publishDestination: ${{ parameters.publishDestination }} | ||
| dryRun: ${{ parameters.dryRun }} | ||
| internalFeedSource: ${{ parameters.internalFeedSource }} | ||
| publicNuGetSource: ${{ parameters.publicNuGetSource }} | ||
| publishSymbols: ${{ parameters.publishSymbols }} | ||
| packageFolderName: ${{ parameters.packageFolderName }} | ||
| nugetPackageVersion: ${{ parameters.nugetPackageVersion }} | ||
| product: ${{ parameters.product }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| ################################################################################# | ||
| # Licensed to the .NET Foundation under one or more agreements. # | ||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||
| # See the LICENSE file in the project root for more information. # | ||
| ################################################################################# | ||
| parameters: | ||
| - name: path | ||
| type: string | ||
|
|
||
| steps: | ||
| - script: | | ||
| echo "Packages in ${{ parameters.path }}:" | ||
| find "${{ parameters.path }}" -name "*.nupkg" -maxdepth 3 | ||
| displayName: 'List Packages' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,32 @@ | ||||||||||||||||||||||
| ################################################################################# | ||||||||||||||||||||||
| # Licensed to the .NET Foundation under one or more agreements. # | ||||||||||||||||||||||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||||||||||||||||||||||
| # See the LICENSE file in the project root for more information. # | ||||||||||||||||||||||
| ################################################################################# | ||||||||||||||||||||||
| parameters: | ||||||||||||||||||||||
| - name: dryRun | ||||||||||||||||||||||
| type: boolean | ||||||||||||||||||||||
|
There was a problem hiding this comment. [nitpick] Missing default value for required parameter. While
Suggested change
|
||||||||||||||||||||||
| - name: internalFeedSource | ||||||||||||||||||||||
| type: string | ||||||||||||||||||||||
| - name: packagesGlob | ||||||||||||||||||||||
| type: string | ||||||||||||||||||||||
| default: '$(System.DefaultWorkingDirectory)/_dotnet-sqlclient-Official/drop_buildMDS_build_signed_package/*.nupkg' | ||||||||||||||||||||||
|
There was a problem hiding this comment. The default value for
Suggested change
|
||||||||||||||||||||||
|
|
||||||||||||||||||||||
| steps: | ||||||||||||||||||||||
| - script: | | ||||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Should we start putting these elaborate PowerShell scripts into files so we can:
|
||||||||||||||||||||||
| set -e | ||||||||||||||||||||||
| SRC='${{ parameters.internalFeedSource }}' | ||||||||||||||||||||||
| if [ -z "$SRC" ]; then | ||||||||||||||||||||||
| echo "Internal feed source parameter not set." | ||||||||||||||||||||||
| exit 1 | ||||||||||||||||||||||
| fi | ||||||||||||||||||||||
| if [ "${{ parameters.dryRun }}" = "true" ]; then | ||||||||||||||||||||||
| echo "[DRY RUN] Would push to $SRC" | ||||||||||||||||||||||
| find "${{ parameters.packagesGlob }}" -name "*.nupkg" | ||||||||||||||||||||||
| exit 0 | ||||||||||||||||||||||
| fi | ||||||||||||||||||||||
| for f in $(find "${{ parameters.packagesGlob }}" -name "*.nupkg"); do | ||||||||||||||||||||||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
cheenamalhotra marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment. The
Suggested change
|
||||||||||||||||||||||
| echo "Push $f" | ||||||||||||||||||||||
| dotnet nuget push --source "$SRC" --api-key az "$f" | ||||||||||||||||||||||
| done | ||||||||||||||||||||||
|
Comment on lines
+42
to
+45
There was a problem hiding this comment. The dry run logic only prints files but doesn't skip the actual push operation. When
Suggested change
|
||||||||||||||||||||||
| displayName: 'Publish to Internal Feed' | ||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,49 @@ | ||||||||
| ################################################################################# | ||||||||
| # Licensed to the .NET Foundation under one or more agreements. # | ||||||||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||||||||
| # See the LICENSE file in the project root for more information. # | ||||||||
| ################################################################################# | ||||||||
| parameters: | ||||||||
| - name: dryRun | ||||||||
| type: boolean | ||||||||
|
There was a problem hiding this comment. [nitpick] Missing default value for required parameter. While
Suggested change
|
||||||||
| - name: publicNuGetSource | ||||||||
| type: string | ||||||||
| - name: nugetServiceConnection | ||||||||
| type: string | ||||||||
| default: 'ADO Nuget Org Connection' | ||||||||
| - name: packagesGlob | ||||||||
| type: string | ||||||||
| default: '$(System.DefaultWorkingDirectory)/_dotnet-sqlclient-Official/drop_buildMDS_build_signed_package/*.nupkg' | ||||||||
|
|
||||||||
|
Comment on lines
+19
to
+20
There was a problem hiding this comment. The default value for
Suggested change
|
||||||||
| steps: | ||||||||
| - task: NuGetToolInstaller@1 | ||||||||
|
Contributor
There was a problem hiding this comment. I'd be surprised if the images we use don't have NuGet installed already. |
||||||||
| displayName: 'Install Latest Nuget' | ||||||||
| inputs: | ||||||||
| checkLatest: true | ||||||||
| - script: | | ||||||||
| echo "[DRY RUN] Listing packages targeted for push to: ${{ parameters.publicNuGetSource }}" | ||||||||
| echo "Using glob pattern: ${{ parameters.packagesGlob }}" | ||||||||
| # Derive directory and filename pattern from the glob for a precise find (handles nested patterns minimally) | ||||||||
| glob='${{ parameters.packagesGlob }}' | ||||||||
| dir="${glob%/*}" | ||||||||
| name="${glob##*/}" | ||||||||
| echo "Resolved directory: $dir" | ||||||||
| echo "Filename pattern: $name" | ||||||||
| if [ -d "$dir" ]; then | ||||||||
| echo "Matched files:" || true | ||||||||
| # Limit depth to avoid traversing unrelated trees; adjust if patterns intentionally include deeper globs | ||||||||
| find "$dir" -maxdepth 2 -type f -name "$name" -print || true | ||||||||
| else | ||||||||
| echo "Directory does not exist yet: $dir" | ||||||||
| fi | ||||||||
| displayName: 'Dry Run - List Packages' | ||||||||
| condition: and(succeeded(), eq(${{ parameters.dryRun }}, true)) | ||||||||
|
|
||||||||
| - task: NuGetCommand@2 | ||||||||
| displayName: 'Push to Nuget.org' | ||||||||
| condition: and(succeeded(), eq(${{ parameters.dryRun }}, false)) | ||||||||
| inputs: | ||||||||
| command: push | ||||||||
| packagesToPush: '${{ parameters.packagesGlob }}' | ||||||||
| nuGetFeedType: external | ||||||||
| publishFeedCredentials: '${{ parameters.nugetServiceConnection }}' | ||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We seem to have two "jobs" directories, and it's not clear which jobs belong where. Just food for thought as we re-write the pipelines. It's hard to tell which files are used by which pipelines when they're all smushed into the same tree.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I apologize for this. I made the new folders to separate the new (and model) pipelines from the old ones. For new (and properly built) pipelines, put stuff in eng/pipelines/jobs. Old stuff stays in eng/pipelines/common/templates/jobs.