pin gha #60948
Merged
pin gha #60948
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
dotnet-issue-labeler
bot
added
the
area-infrastructure
jeffhandley
reviewed
Mar 17, 2025
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
jeffhandley
approved these changes
Mar 18, 2025
wtgodbe
approved these changes
Mar 18, 2025
First I've heard of this list - good to hear it. Where is it? Feel free to hit merge and update or I can. |
|
https://github.com/dotnet/aspnetcore/settings/actions - updating now |
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/13953100523 |
|
@wtgodbe backporting to "release/9.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: pin gha
Using index info to reconstruct a base tree...
M .github/workflows/update-sdk.yml
A .github/workflows/update-selenium-and-playwright-dependencies.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .github/workflows/update-selenium-and-playwright-dependencies.yml deleted in HEAD and modified in pin gha. Version pin gha of .github/workflows/update-selenium-and-playwright-dependencies.yml left in tree.
Auto-merging .github/workflows/update-sdk.yml
CONFLICT (content): Merge conflict in .github/workflows/update-sdk.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 pin gha
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
(That was a test, we don't actually want this change in 9.0) |
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.
given https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised
pin our github actions using https://github.com/mheap/pin-github-action and spot check the SHAs.