Skip to content

Conversation

@dbreshears
Copy link
Member

Summary of the changes

  • Updating Ubuntu image due to 20.04 being out of support

@dbreshears dbreshears requested review from a team and ToddGrun and removed request for ToddGrun October 16, 2025 05:39
@dbreshears dbreshears merged commit b6fd2e4 into main Oct 16, 2025
11 checks passed
@dbreshears dbreshears deleted the dev/devinb/ubuntu branch October 16, 2025 15:37
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Oct 16, 2025
@github-actions
Copy link
Contributor

@dbreshears an error occurred while backporting to "release/dev17.8", please check the run log for details!

Error: @dbreshears is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=dbreshears

@dbreshears
Copy link
Member Author

dbreshears commented Oct 16, 2025

/backport to release/dev17.8

@github-actions
Copy link
Contributor

Started backporting to release/dev17.8: https://github.com/dotnet/razor/actions/runs/18576744688

@github-actions
Copy link
Contributor

@dbreshears backporting to "release/dev17.8" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Update to Ubuntu 22.04 due to 20.04 being out of support
Using index info to reconstruct a base tree...
M	azure-pipelines-official.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-official.yml
CONFLICT (content): Merge conflict in azure-pipelines-official.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 set advice.mergeConflict false"
Patch failed at 0001 Update to Ubuntu 22.04 due to 20.04 being out of support
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@dotnet dotnet deleted a comment from github-actions bot Oct 16, 2025
@dbreshears
Copy link
Member Author

/backport to release/dev18.0

@github-actions
Copy link
Contributor

Started backporting to release/dev18.0: https://github.com/dotnet/razor/actions/runs/18576780219

@dbreshears
Copy link
Member Author

/backport to release/dev17.14

@github-actions
Copy link
Contributor

Started backporting to release/dev17.14: https://github.com/dotnet/razor/actions/runs/18576791036

@dbreshears
Copy link
Member Author

/backport to release/dev17.12

@github-actions
Copy link
Contributor

Started backporting to release/dev17.12: https://github.com/dotnet/razor/actions/runs/18576800069

@dbreshears
Copy link
Member Author

/backport to release/dev17.13

@github-actions
Copy link
Contributor

Started backporting to release/dev17.13: https://github.com/dotnet/razor/actions/runs/18576811722

@dbreshears
Copy link
Member Author

/backport to release/vscode

@github-actions
Copy link
Contributor

Started backporting to release/vscode: https://github.com/dotnet/razor/actions/runs/18577397648

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants