ci: merge integration branch before endo checkout #8892
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
michaelfig
approved these changes
Feb 12, 2024
mhofman
added a commit
that referenced
this pull request
Feb 18, 2024
mhofman
added a commit
that referenced
this pull request
Feb 18, 2024
mhofman
added a commit
that referenced
this pull request
Feb 19, 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.
refs: #8715
refs: https://github.com/Agoric/agoric-sdk/actions/runs/7868048310/job/21464643015
Description
#8715 staged a new
endo-sha.txtwhen running with an integration against endo, but didn't take in consideration that an integration branch may be merged in those cases. This re-orders the steps taken to merge the integration branch before checking out endo, and more importantly, before staging the endo tracking file, which would prevent the merge.Security Considerations
None
Scaling Considerations
None
Documentation Considerations
None
Testing Considerations
Reproduced the steps locally. Also triggering in CI with the following:
Upgrade Considerations
CI only change that should be cherry-picked into the release branch when release sync occurs.