Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Update restore-node dirty check to ignore untracked endo-sha.txt #9709

Merged
merged 4 commits into from
Jul 16, 2024

Conversation

gibson042
Copy link
Member

Fixes #9708

Description

Tolerates removal of endo-sha.txt by e.g. git reset --hard HEAD contributing to a restored cache state. Also includes minor cleanup of GitHub actions files.

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

@gibson042 gibson042 requested review from mhofman and michaelfig July 13, 2024 22:29
Copy link

cloudflare-workers-and-pages bot commented Jul 13, 2024

Deploying agoric-sdk with  Cloudflare Pages  Cloudflare Pages

Latest commit: 8a094a7
Status: ✅  Deploy successful!
Preview URL: https://61a2d4a9.agoric-sdk.pages.dev
Branch Preview URL: https://gibson-9708-restore-node-cac.agoric-sdk.pages.dev

View logs

Copy link
Member

@michaelfig michaelfig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. I'd like to see CI pass before I approve.

.github/actions/restore-node/action.yml Outdated Show resolved Hide resolved
@gibson042 gibson042 requested a review from michaelfig July 15, 2024 19:47
@LuqiPan
Copy link
Contributor

LuqiPan commented Jul 16, 2024

@gibson042 any plan to land this PR today/this week? Looks like there are a few victims to this CI bug.

@gibson042 gibson042 added the automerge:rebase Automatically rebase updates, then merge label Jul 16, 2024
* Separate steps with blank lines.
* Define conditional-step "if" before properties relevant to its execution.
* Define step "working-directory"/"env"/"shell" before shell code to "run".
* Prefix github-script console.log output with a label.
@gibson042 gibson042 force-pushed the gibson-9708-restore-node-cache-assertions branch from e3e198c to 0b15167 Compare July 16, 2024 17:47
@mergify mergify bot merged commit 7bde505 into master Jul 16, 2024
79 checks passed
@mergify mergify bot deleted the gibson-9708-restore-node-cache-assertions branch July 16, 2024 18:45
mergify bot pushed a commit that referenced this pull request Jul 16, 2024
Ref #9709
Ref #9708

## Description
As of #9709, git state may not include untracked files after our custom [restore-node GitHub action](https://github.com/Agoric/agoric-sdk/blob/7bde505dd23289218a19bc86f8e94bbff48b65e0/.github/actions/restore-node/action.yml), in which case the after-merge workflow job "dev-canary" will execute a [no-op `git stash` followed later by a no-op `git stash apply`](https://github.com/Agoric/agoric-sdk/blob/7bde505dd23289218a19bc86f8e94bbff48b65e0/.github/workflows/after-merge.yml#L78-L84), 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge:rebase Automatically rebase updates, then merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom GitHub action "restore-node" can fail on job retry
3 participants