-
Notifications
You must be signed in to change notification settings - Fork 215
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: merge endo integration branch #8261
Conversation
@michaelfig I believe you already planned to integrate the currently breaking endo changes? Can you stage those in an |
5623b3e
to
34cf896
Compare
@michaelfig it looks like |
I'm just curious how you think we should manage |
It doesn't need to be the branch name used for the PR, but yes I would expect it to contain the commits we want to land on agoric-sdk when we cut a release of Endo. It's ok for it to be a direct ancestor of master when there are no commits required to make agoric-sdk compatible. But like now I would expect it to contain a staging of the commits to fix agoric-sdk and make the daily integration CI job green. |
34cf896
to
2722f1b
Compare
Confirmed that it created a merge commit using the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Description
For CI runs which run using an endo branch instead of NPM packages, merge in a branch named
integration-endo-${endoBranchName}
if it exists. This allows staging changes to support the upcoming endo release, including any known breaking changes.Security Considerations
None
Scaling Considerations
None
Documentation Considerations
TBD (integration branch name should be added to any place that document this endo integration feature)
Testing Considerations
The
integration-endo-master
branch is being used by this PR which uses themaster
branch of endo for its checks.Upgrade Considerations
None