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: merge endo integration branch #8261

Merged
merged 1 commit into from
Sep 9, 2023

Conversation

mhofman
Copy link
Member

@mhofman mhofman commented Aug 27, 2023

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 the master branch of endo for its checks.

#endo-branch: master

Upgrade Considerations

None

@mhofman
Copy link
Member Author

mhofman commented Aug 27, 2023

@michaelfig I believe you already planned to integrate the currently breaking endo changes? Can you stage those in an integration-endo-master branch ?

@mhofman mhofman marked this pull request as draft August 27, 2023 22:56
@mhofman mhofman force-pushed the mhofman/endo-ci-integration-branch branch 4 times, most recently from 5623b3e to 34cf896 Compare September 1, 2023 23:43
@mhofman mhofman marked this pull request as ready for review September 2, 2023 00:38
@mhofman mhofman requested a review from michaelfig September 2, 2023 00:38
@mhofman mhofman marked this pull request as draft September 2, 2023 00:40
@mhofman
Copy link
Member Author

mhofman commented Sep 2, 2023

@michaelfig it looks like integration-endo-master is still an ancestor of master so no branch merge is being created. Until then I cannot mark this PR as ready for review.

@mhofman mhofman removed the request for review from michaelfig September 2, 2023 00:41
@michaelfig
Copy link
Member

it looks like integration-endo-master is still an ancestor of master

I'm just curious how you think we should manage integration-endo-master. Should it be the branch for a PR based on master that becomes the complete Endo sync PR and we merge it when ready? Then would we recreate the same branch name with a new PR every time after that process?

@mhofman
Copy link
Member Author

mhofman commented Sep 4, 2023

it looks like integration-endo-master is still an ancestor of master

I'm just curious how you think we should manage integration-endo-master. Should it be the branch for a PR based on master that becomes the complete Endo sync PR and we merge it when ready? Then would we recreate the same branch name with a new PR every time after that process?

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.

@mhofman mhofman force-pushed the mhofman/endo-ci-integration-branch branch from 34cf896 to 2722f1b Compare September 8, 2023 20:20
@mhofman mhofman marked this pull request as ready for review September 8, 2023 20:32
@mhofman
Copy link
Member Author

mhofman commented Sep 8, 2023

Confirmed that it created a merge commit using the integration-endo-master branch, which is an actual branch and not pointing at a predecessor, so R4R!

@mhofman mhofman added the automerge:squash Automatically squash merge label Sep 8, 2023
@mhofman mhofman requested a review from michaelfig September 8, 2023 21:50
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.

LGTM!

@mergify mergify bot merged commit 3ac36ad into master Sep 9, 2023
@mergify mergify bot deleted the mhofman/endo-ci-integration-branch branch September 9, 2023 03:19
anilhelvaci pushed a commit to Jorge-Lopes/agoric-sdk that referenced this pull request Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge:squash Automatically squash merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants