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

Enable GitHub merge queues #3577

Open
Zac-HD opened this issue Feb 9, 2023 · 1 comment
Open

Enable GitHub merge queues #3577

Zac-HD opened this issue Feb 9, 2023 · 1 comment
Assignees
Labels
tests/build/CI about testing or deployment *of* Hypothesis

Comments

@Zac-HD
Copy link
Member

Zac-HD commented Feb 9, 2023

We just got beta access to GitHub merge queues, which are great.

In particular, this will ensure that we no longer have merge conflicts from the window between merging a PR to master and our CD system deploying it and pushing the commit to fix the changelog etc. It also avoids semantic merge conflicts where two PRs pass tests in isolation but fail together, but those haven't been much of a problem for Hypothesis to date. Tasks:

  • upgrade internal tooling to handle the magic merge-queue branch prefixes instead of master
  • add assertions to break releases etc if merge queues are unexpectedly disabled
  • enable merge queues in repo settings and require them with branch-protection rules
@Zac-HD Zac-HD added the tests/build/CI about testing or deployment *of* Hypothesis label Feb 9, 2023
@Zac-HD Zac-HD self-assigned this Feb 9, 2023
@Zac-HD
Copy link
Member Author

Zac-HD commented Apr 22, 2023

PyPI has recently added 'trusted publishers', supporting short-lived and highly secure tokens for publishing. It'd be great to switch over to that too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tests/build/CI about testing or deployment *of* Hypothesis
Projects
None yet
Development

No branches or pull requests

1 participant