Skip to content

Commit a1ebf96

Browse files
authored
Use central release workflow to create and cleanup release branches according to branch-info (#1560)
* Create and cleanup branches as part of release workflow See https://gardener.github.io/cc-utils/github_actions.html#release-branches for reference references. Signed-off-by: Jonas Brand (8R0WNI3) <j.brand@sap.com> * Adjust `supported-versions-count` to old behaviour in cleanup policy Signed-off-by: Jonas Brand (8R0WNI3) <j.brand@sap.com> --------- Signed-off-by: Jonas Brand (8R0WNI3) <j.brand@sap.com>
1 parent 3b04934 commit a1ebf96

File tree

4 files changed

+3
-127
lines changed

4 files changed

+3
-127
lines changed

.github/workflows/create-branch.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/release-cleanup.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
next-version: ${{ inputs.next-version }}
4545
next-version-callback-action-path: .github/actions/prepare-release
4646
slack-channel-id: C9CEBQPGE # #sap-tech-gardener
47+
create-release-branch: true
48+
cleanup-release-branches: true
4749
permissions:
4850
contents: write
4951
packages: write
@@ -59,14 +61,3 @@ jobs:
5961
name: ${{ needs.release-to-github-and-bump.outputs.component-descriptor.version }}
6062
strip_patch: true
6163
secrets: inherit
62-
63-
create-release-branch:
64-
if: ${{ inputs.next-version == 'bump-minor' && inputs.release-version == 'set-prerelease' }}
65-
needs:
66-
- release-to-github-and-bump
67-
uses: ./.github/workflows/create-branch.yaml
68-
with:
69-
version: ${{ needs.release-to-github-and-bump.outputs.component-descriptor.version }}
70-
secrets: inherit
71-
permissions:
72-
contents: write

.ocm/branch-info.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
release-branch-template: release-v$major.$minor # e.g. release-v1.0
22
branch-policy:
33
significant-part: minor # major, minor, patch
4-
supported-versions-count: 2
4+
supported-versions-count: 3
55
release-cadence: 4w # d (days), w (weeks), y | yr (years)

0 commit comments

Comments
 (0)