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

Revert branches to main #378

Merged
merged 1 commit into from
Aug 9, 2021
Merged

Revert branches to main #378

merged 1 commit into from
Aug 9, 2021

Conversation

mscroggs
Copy link
Member

@mscroggs mscroggs commented Aug 9, 2021

No description provided.

@mscroggs mscroggs merged commit 15fdc09 into main Aug 9, 2021
@mscroggs mscroggs deleted the branches-2021-08-09 branch August 9, 2021 15:18
@michalhabera
Copy link
Contributor

Was this needed? I thought I disabled cross-repo status check as required.

@mscroggs
Copy link
Member Author

Don't we want the cross repo check to be required so we can't merge things that break DOLFINx without noticing?

@michalhabera
Copy link
Contributor

So my idea was: Develop your cross repo PR as usual, dolfinx/my-feature and ffcx/my-feature. Their CIs points to each other, once both PRs are green and approved, just for the merging action you'd set ffcx/my-feature CI point to dolfinx/main. This CI would fail, but you can merge it. Then you'd point dolfinx/my-feature to ffcx/main, which would not fail, and you can merge it.

@mscroggs
Copy link
Member Author

Ah I see, so we can reset the branch names before merging the first PR now, then there's no need for a second PR. I'll do that from now on

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants