[automated] Merge branch 'release/3.1' => 'main'#31592
Merged
sebastienros merged 3 commits intodotnet:mainfrom Apr 8, 2021
Merged
[automated] Merge branch 'release/3.1' => 'main'#31592sebastienros merged 3 commits intodotnet:mainfrom
sebastienros merged 3 commits intodotnet:mainfrom
Conversation
* Update branding to 3.1.15 Update Ubuntu 16.04 to 18.04 * Remove obsolete groovy code
1ab35bc to
48133cc
Compare
Member
|
@JunTaoLuo do we want the changes in this PR? Have they already been made in main? |
Member
|
The build jobs keep getting cancelled. |
Member
|
Believe this is related to https://github.com/dotnet/core-eng/issues/10136 and https://github.com/dotnet/core-eng/issues/12699. @ulisesh may know more |
Member
|
Seeing it here too: #31620. I'll post in First Responders |
wtgodbe
reviewed
Apr 8, 2021
| ${{ if eq(parameters.useHostedUbuntu, false) }}: | ||
| ${{ if eq(variables['System.TeamProject'], 'public') }}: | ||
| name: NetCorePublic-Pool | ||
| queue: BuildPool.Ubuntu.1604.Amd64.Open |
Member
There was a problem hiding this comment.
@sebastienros should work if you undo this change and the change at line 111 (keep line 104)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I detected changes in the release/3.1 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/3.1 by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.