Skip to content

ci: Improve gitflow process #7019

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Feb 1, 2023
Merged

ci: Improve gitflow process #7019

merged 1 commit into from
Feb 1, 2023

Conversation

mydea
Copy link
Member

@mydea mydea commented Feb 1, 2023

This supersedes #6999.

With this PR:

  • We do not run auto-approval (until we figured this out)
  • We only run develop->master sync when merging a PR with a title starting with meta(changelog):
  • We merge this exact commit into master, not current develop (so if something was merged in the meanwhile, it should not go into this release).
  • develop->master sync cannot be triggered via workflow_dispatch anymore (to simplify this. We can still always do this manually)

@mydea mydea added the Dev: CI label Feb 1, 2023
@mydea mydea requested review from lforst, Lms24 and AbhiPrasad February 1, 2023 11:22
@mydea mydea self-assigned this Feb 1, 2023
@mydea mydea force-pushed the fn/better-ci-master-sync branch from 7c12bc5 to ef83fb6 Compare February 1, 2023 11:39
@mydea mydea enabled auto-merge (squash) February 1, 2023 11:47
@mydea mydea merged commit 16addf5 into develop Feb 1, 2023
@mydea mydea deleted the fn/better-ci-master-sync branch February 1, 2023 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lms24 Lms24 Lms24 approved these changes

@AbhiPrasad AbhiPrasad AbhiPrasad approved these changes

@lforst lforst Awaiting requested review from lforst

Assignees

@mydea mydea

Labels
Dev: CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mydea @Lms24 @AbhiPrasad