From ce1c399b27e6055f53983b1fe953fe950416d15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C4=85tkowski?= Date: Wed, 3 Jun 2026 16:28:20 +0200 Subject: [PATCH] gen workflows: trigger create_release_pr on RC release branches Add release-candidate bump tokens (major-rc, minor-rc, patch-rc, rc, rc-release) to the create_release_pr.yaml template push triggers for the main, master and release bases. Without these, repos generated by devctl never start a release PR when an RC branch like main#release#minor-rc is pushed, so RC releases couldn't be cut the way stable ones are. Explicit-version and maintenance-branch patterns are unchanged: their 'v*.*.*' globs already match RC versions such as v2.1.0-rc.1. Requires the matching reusable-workflow support in giantswarm/github-workflows#195. Co-Authored-By: Claude Sonnet 4.6 --- CHANGELOG.md | 4 ++++ .../internal/file/create_release_pr.yaml.template | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5b1ece00..eed6e7311 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Added + +- `gen workflows`: the generated `create_release_pr.yaml` now triggers on release-candidate branches (`#release#{major-rc,minor-rc,patch-rc,rc,rc-release}`) for the `main`, `master`, and `release` bases, so RC releases get an automatic release PR just like the stable `major`/`minor`/`patch` tokens. Requires the matching support in [giantswarm/github-workflows#195](https://github.com/giantswarm/github-workflows/pull/195). + ## [8.4.0] - 2026-06-03 ### Added diff --git a/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template b/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template index ec2ad6c42..0436f9463 100644 --- a/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template +++ b/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template @@ -8,14 +8,29 @@ on: - 'main#release#major' - 'main#release#minor' - 'main#release#patch' + - 'main#release#major-rc' + - 'main#release#minor-rc' + - 'main#release#patch-rc' + - 'main#release#rc' + - 'main#release#rc-release' - 'master#release#v*.*.*' - 'master#release#major' - 'master#release#minor' - 'master#release#patch' + - 'master#release#major-rc' + - 'master#release#minor-rc' + - 'master#release#patch-rc' + - 'master#release#rc' + - 'master#release#rc-release' - 'release#v*.*.*' - 'release#major' - 'release#minor' - 'release#patch' + - 'release#major-rc' + - 'release#minor-rc' + - 'release#patch-rc' + - 'release#rc' + - 'release#rc-release' - 'release-v*.*.x#release#v*.*.*' # "!" negates previous positive patterns so it has to be at the end. - '!release-v*.x.x#release#v*.*.*'