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

DATAGO-72162: Fixing release action after initial release #64

Merged
merged 15 commits into from
Mar 14, 2024

Conversation

clarkbains
Copy link
Collaborator

Fixes the issues encountered in the 1.0.0 release

  • Allows for RC versions
    • The prepare for next development commit is now <version>-NEXT-SNAPSHOT
      This would have been the commits pushed to main with the previous flow
Dev releases 1.0.0-RC1
GHA commits as 1.0.0-RC1 and performs release activities
GHA commits as 1.0.1-SNAPSHOT for next development iteration
Dev releases 1.0.0-RC2
GHA commits as 1.0.0-RC2 and performs release activities
GHA commits as 1.0.1-SNAPSHOT for next development iteration
Dev releases 1.0.0
GHA commits as 1.0.0 and performs release activities
GHA commits as 1.0.1-SNAPSHOT for next development iteration
Dev releases 1.0.1
GHA commits as 1.0.1 and performs release activities
GHA commits as 1.0.2-SNAPSHOT for next development iteration

With this alternate scheme

Dev releases 1.0.0-RC1
GHA commits as 1.0.0-RC1 and performs release activities
GHA commits as 1.0.0-RC1-NEXT-SNAPSHOT for next development iteration
Dev releases 1.0.0-RC2
GHA commits as 1.0.0-RC2 and performs release activities
GHA commits as 1.0.0-RC2-NEXT-SNAPSHOT for next development iteration <----
Dev releases 1.0.0
GHA commits as 1.0.0 and performs release activities
GHA commits as 1.0.0-NEXT-SNAPSHOT for next development iteration
Dev releases 1.0.1
GHA commits as 1.0.1 and performs release activities
GHA commits as 1.0.1-NEXT-SNAPSHOT for next development iteration
  • Versioning commits now use ssh keys instead of http, and can bypass branch protections
  • autorelease is now enabled, so releases will automatically be released on maven central

@SravanThotakura05
Copy link
Collaborator

@clarkbains for this scenario

GHA commits as 1.0.0 and performs release activities
GHA commits as 1.0.0-NEXT-SNAPSHOT for next development iteration
Dev releases 1.0.1
GHA commits as 1.0.1 and performs release activities
GHA commits as 1.0.1-NEXT-SNAPSHOT for next development iteration

Can we follow our earlier pattern

GHA commits as 1.0.0 and performs release activities
GHA commits as 1.0.1-SNAPSHOT for next development iteration

For Release candidate I understand that we can't auto increment numbers like RC1 and RC2 so adding NEXT looks good. But for actual release it would be nice if we can set next iteration snapshot

Is it possible only if RC is added by user we append NEXT in other cases we follow regular pattern?

@clarkbains
Copy link
Collaborator Author

For releases containing ea or rc, we no longer bump. For everything else, we do. This avoids the NEXT issue.
Eg

[CI] 1.0.0-RC1 <- Triggered by action, this is the commit the release is built from
[CI] 1.0.0-SNAPSHOT <- done at very end of action, this resets so we can continue building snapshots out of main automatically. Note, patch not incremented
[DEV] merge pr 1
[CI] 1.0.0-RC2
[CI] 1.0.0-SNAPSHOT
[DEV] merge pr 2
[CI] 1.0.0
[CI] 1.0.1-SNAPSHOT <- here we did a non rc/ea release, so we've incremented patch

@clarkbains clarkbains merged commit 4aa0b61 into SolaceLabs:main Mar 14, 2024
3 checks passed
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.

3 participants