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

Turn off repo setting that all PRs must be on the latest main #1373

Open
tjprescott opened this issue Dec 5, 2022 · 3 comments
Open

Turn off repo setting that all PRs must be on the latest main #1373

tjprescott opened this issue Dec 5, 2022 · 3 comments
Milestone

Comments

@tjprescott
Copy link
Member

Based on a true story...

  • Spend 20 minutes waiting for CI to turn green so you can merge PR.
  • At minute 19 someone merged a docs PR and not you can't merge yours because you are not on the latest in main.
  • Rebase or merge and wait another 20 minutes. Hope no one else merges something in the meantime...

This repo setting isn't set for any of the other repos I work in like azure-rest-api-specs and azure-sdk-for-python and it works fine. It only forces you to merge or rebase if there are conflicts. Is there something about submodules that necessitates this policy?

@ghost ghost added the Needs Triage label Dec 5, 2022
@timotheeguerin
Copy link
Member

We just had many instances of 2 prs conflicting and making the CI fail in main branch requiring a fix to be made or it blocked everybody.

@nguerrera
Copy link
Contributor

nguerrera commented Dec 8, 2022

I recall my main motivation for turning this on reluctantly was when we shipped with changes in a release without their changelogs. There's a race between the publish PR and the actual publishing in CI. If someone checks in a change while the publish PR is pending then when the publish PR merges, it will publish their change too, but their changelog will be in the next release not the current one.

I put in a check that there are no more changelogs to prevent this, but it requires that you cannot merge the publish PR without running validation against it with all the changes that are already in.

That said, I'd be happy if we find a better publish process to solve this. For example, fully automating the process and having it snapshot a branch from which the release is done to keep main unblocked while in progress.

@tjprescott
Copy link
Member Author

Do we tag the release? Then we could target the specific tag for creating the changelog.

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

No branches or pull requests

5 participants