[automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#129… · dotnet/runtime@a5e2ad7 · GitHub
Skip to content

Commit a5e2ad7

Browse files
akoeplingerakoeplinger
authored
[automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#129441)
I detected changes in the release/9.0 branch which have not been merged yet to release/9.0-staging. I'm a robot and am configured to help you automatically keep release/9.0-staging up to date, so I've opened this PR. This PR merges commits made on release/9.0 by the following committers: * svick * steveisok ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout release/9.0 git pull --ff-only git checkout release/9.0-staging git pull --ff-only git merge --no-ff release/9.0 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-to-release/9.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging git pull https://github.com/dotnet/runtime merge/release/9.0-to-release/9.0-staging (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging git pull git@github.com:dotnet/runtime merge/release/9.0-to-release/9.0-staging (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
2 parents 6e718e4 + 944d576 commit a5e2ad7

3 files changed

Lines changed: 45 additions & 0 deletions

File tree

‎eng/pipelines/libraries/helix.yml‎

Lines changed: 12 additions & 0 deletions

‎eng/pipelines/libraries/outerloop.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ extends:
5252
testScope: outerloop
5353
creator: dotnet-bot
5454
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
55+
# On scheduled runs (always:false) don't fail the build on Helix work item or
56+
# test failures, so flaky outerloop tests don't keep AzDO re-queueing the same
57+
# commit. The Send to Helix step fully succeeds (not partiallySucceeded). Failed
58+
# work items are still surfaced as warnings in the timeline (warnOnTestFailures).
59+
${{ if eq(variables['Build.Reason'], 'Schedule') }}:
60+
failOnTestFailures: false
61+
warnOnTestFailures: true
5562

5663
- ${{ if eq(variables['isRollingBuild'], false) }}:
5764
- template: /eng/pipelines/common/platform-matrix.yml
@@ -81,6 +88,11 @@ extends:
8188
testScope: outerloop
8289
creator: dotnet-bot
8390
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
91+
# Don't fail scheduled builds on Helix work item/test failures; surface them
92+
# as timeline warnings instead (see above).
93+
${{ if eq(variables['Build.Reason'], 'Schedule') }}:
94+
failOnTestFailures: false
95+
warnOnTestFailures: true
8496

8597
- ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
8698
- template: /eng/pipelines/common/platform-matrix.yml
@@ -106,3 +118,8 @@ extends:
106118
testScope: outerloop
107119
creator: dotnet-bot
108120
extraHelixArguments: /p:BuildTargetFramework=net48
121+
# Don't fail scheduled builds on Helix work item/test failures; surface them
122+
# as timeline warnings instead (see above).
123+
${{ if eq(variables['Build.Reason'], 'Schedule') }}:
124+
failOnTestFailures: false
125+
warnOnTestFailures: true

‎src/libraries/sendtohelixhelp.proj‎

Lines changed: 16 additions & 0 deletions

0 commit comments

Comments
 (0)