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.

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

chore: defers tagging to post-merge #691

Merged
merged 32 commits into from
Oct 4, 2023
Merged

chore: defers tagging to post-merge #691

merged 32 commits into from
Oct 4, 2023

Conversation

NQuinn27
Copy link
Contributor

This PR defers the tagging until after the release PR has been merged.

Changes in create-release.yml

  • Use inputs to select which commitizen release type to use
  • Use commitizen directly to bump the version without creating a tag
  • Create the PR for the release

This PR adds post-merge.yml

  • In the event a PR has been merged, and the head is release/next and the base is master, the workflow is run
  • The workflow creates a tag based on the current commitizen version

Here is a sample PR for the pre-merge flow: #690

@NQuinn27 NQuinn27 requested a review from a team as a code owner September 28, 2023 20:41
@github-actions
Copy link
Contributor

github-actions bot commented Sep 28, 2023 •
edited
Loading

Warnings
⚠️ This PR doesn't seem to contain any updated Unit Test 🤔. Please consider double checking it.🙏
⚠️ Please assign someone aside from CODEOWNERS (@checkout-pci-reviewers) to review this PR.

Generated by 🚫 Danger Swift against 3a01915

@github-actions
Copy link
Contributor

github-actions bot commented Sep 28, 2023 •
edited
Loading

Appetize link: https://appetize.io/app/eotjcbqtyynetai3kalrfkjkeq

@NQuinn27 NQuinn27 requested review from semirp and removed request for HarryPrimer October 2, 2023 15:39
semirp
semirp approved these changes Oct 2, 2023
View reviewed changes
.github/workflows/post_merge.yml Outdated Show resolved Hide resolved
.github/workflows/post_merge.yml Outdated Show resolved Hide resolved
semirp
semirp approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@semirp semirp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@NQuinn27
Copy link
Contributor Author

NQuinn27 commented Oct 4, 2023

ADR note: https://www.notion.so/primerio/ADR-Release-workflow-defer-tagging-to-post-merge-3582d49acd5b4f9982fd54c81e083e42?pvs=4
Flow diagram for entire flow:
image

@NQuinn27 NQuinn27 requested a review from xevious78 October 4, 2023 14:00
@NQuinn27 NQuinn27 merged commit 80d24ce into master Oct 4, 2023
@NQuinn27 NQuinn27 deleted the nq/release_flow_tests branch October 4, 2023 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@borisprimer borisprimer borisprimer approved these changes

@semirp semirp semirp approved these changes

@xevious78 xevious78 xevious78 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NQuinn27 @xevious78 @semirp @borisprimer