Update public Linux build machines to Ubuntu 22.04 #7283
Merged
Conversation
This file contains 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
schmittjoseph
approved these changes
Sep 9, 2024
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/dotnet-monitor/actions/runs/10778164338 |
|
/backport to release/6.x |
|
Started backporting to release/6.x: https://github.com/dotnet/dotnet-monitor/actions/runs/10778178022 |
|
@jander-msft backporting to release/6.x failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/da0434c34fdcb7d365026d53b066e290ba2b4d22.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/da0434c34fdcb7d365026d53b066e290ba2b4d22.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Applying: Update public Linux build machines to Ubuntu 22.04 (#7283)
Using index info to reconstruct a base tree...
M eng/pipelines/jobs/build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/jobs/build.yml
CONFLICT (content): Merge conflict in eng/pipelines/jobs/build.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update public Linux build machines to Ubuntu 22.04 (#7283)
Error: The process '/usr/bin/git' failed with exit code 128 |
schmittjoseph
added a commit
that referenced
this pull request
Sep 12, 2024
* Update dependencies from https://github.com/dotnet/diagnostics build 20240906.1 (#7285) [main] Update dependencies from dotnet/diagnostics * Add Docker Compose sample and cross link (#7276) * Update public Linux build machines to Ubuntu 22.04 (#7283) * Update release tool to .NET 8 and update dependencies (#7284) * [main] Bump Swashbuckle.AspNetCore in /eng/dependabot/independent (#7288) Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.7.1 to 6.7.3. - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](domaindrivendev/Swashbuckle.AspNetCore@v6.7.1...v6.7.3) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * generate release notes (#7294) * Update dependencies from https://github.com/dotnet/diagnostics build 20240909.1 (#7295) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20240909.4 (#7296) [main] Update dependencies from dotnet/arcade * Prevent collected exceptions from being dropped due to null event values (#7301) * Register v9.0.0-rc.1.24453.3 release information (#7303) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/diagnostics build 20240910.1 (#7304) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20240910.4 (#7305) [main] Update dependencies from dotnet/arcade * Restore branch-specific files --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joe Schmitt <[email protected]>
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.
Summary
Release Notes Entry