Skip to content

Enable release branches for patch versions#11463

Draft
silv-io wants to merge 4 commits intomainfrom
enable-release-branches
Draft

Enable release branches for patch versions#11463
silv-io wants to merge 4 commits intomainfrom
enable-release-branches

Conversation

@silv-io
Copy link
Member

@silv-io silv-io commented Sep 4, 2024 •
edited
Loading

Motivation

We want to be able to do patch releases from release branches of the name release/x.y where x.y is the first part of the version tag from which the release branch comes off of.
For this some assumptions need to be removed, like that some workflows need to only run on the master branch.

Changes

  • Use release-branch-semver version scheme for setuptools-scm
  • Remove automatic pushing of latest tag -> TODO: when to push it now?
  • Add previous master-only push triggered workflows for branches matching release/*
  • Adapt the calculation of version boundaries like the following:
    • When we do a patch release, we already are on a release branch, which means that development after will also happen on a release branch. Dev releases happening on release branches increment the patch portion. So the increment commit after the release should do that as well for the lower boundary
    • When we do a major/minor release, the continued work on that will happen on the main branch, meaning the dev releases following it won't happen on release branches. This means they will increment the minor portion of the dev version. This means we need to increment the minor portion of the lower boundary
    • Example:
      • release 3.8.0
        • release branch: release/3.8
        • patch release: 3.8.1
        • next dev version: 3.8.1.dev1
      • main branch
      • next dev version: 3.9.0.dev1

Testing

TODO

What's left to do:

  • Test out correct behavior in testing release/3.7 branches
  • ...

@github-actions
Copy link

github-actions bot commented Sep 4, 2024 •
edited
Loading

Helper Script Tests

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit fcd75e4.

♻️ This comment has been updated with latest results.

@silv-io silv-io added the semver: patch Non-breaking changes which can be included in patch releases label Sep 4, 2024
@silv-io silv-io changed the title Enable release branches Enable release branches for patch versions Sep 4, 2024
@github-actions
Copy link

github-actions bot commented Sep 4, 2024 •
edited
Loading

S3 Image Test Results (AMD64 / ARM64)

  2 files    2 suites   3m 32s ⏱️
421 tests 369 ✅  52 💤 0 ❌
842 runs  738 ✅ 104 💤 0 ❌

Results for commit fcd75e4.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 4, 2024 •
edited
Loading

LocalStack Community integration with Pro

    2 files  ±0      2 suites  ±0   1h 35m 42s ⏱️ - 1m 10s
3 420 tests ±0  3 022 ✅ ±0  398 💤 ±0  0 ❌ ±0 
3 422 runs  ±0  3 022 ✅ ±0  400 💤 ±0  0 ❌ ±0 

Results for commit fcd75e4. ± Comparison against base commit a50e575.

♻️ This comment has been updated with latest results.

@silv-io silv-io added this to the Playground milestone Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexrashed alexrashed Awaiting requested review from alexrashed alexrashed will be requested when the pull request is marked ready for review alexrashed is a code owner

@k-a-il k-a-il Awaiting requested review from k-a-il k-a-il will be requested when the pull request is marked ready for review k-a-il is a code owner

@bentsku bentsku Awaiting requested review from bentsku bentsku will be requested when the pull request is marked ready for review bentsku is a code owner

@thrau thrau Awaiting requested review from thrau thrau will be requested when the pull request is marked ready for review thrau is a code owner

@dfangl dfangl Awaiting requested review from dfangl dfangl will be requested when the pull request is marked ready for review dfangl is a code owner

@dominikschubert dominikschubert Awaiting requested review from dominikschubert dominikschubert will be requested when the pull request is marked ready for review dominikschubert is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

semver: patch Non-breaking changes which can be included in patch releases

Projects

None yet

Milestone

Playground

Development

Successfully merging this pull request may close these issues.

1 participant

@silv-io