ci: Update after-merge workflow to tolerate non-dirty git state #9721
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
gibson042
force-pushed
the
gibson-9708-followup
branch
from
284090f to
51daaa5
Compare
Deploying agoric-sdk with
|
| Latest commit: |
51daaa5
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://f70ee61f.agoric-sdk.pages.dev |
| Branch Preview URL: | https://gibson-9708-followup.agoric-sdk.pages.dev |
gibson042
force-pushed
the
gibson-9708-followup
branch
from
51daaa5 to
72a3271
Compare
mhofman
approved these changes
Jul 16, 2024
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.
Ref #9709
Ref #9708
Description
As of #9709, git state might not include untracked files after our custom restore-node GitHub action, in which case the after-merge workflow job "dev-canary" will execute a no-op
git stashfollowed later by a no-opgit stash apply, the latter of which exits with a non-zero status code that fails the step and thereby the containing job.This PR fixes things to tolerate absence of any stashed changes.
Security Considerations
No relevant change.
Scaling Considerations
n/a
Documentation Considerations
n/a
Testing Considerations
It's difficult to test these kinds of changes, but the proof of the pudding is in the taste.
Upgrade Considerations
n/a