Conversation
Every release, the weekly patch (x.y.100, x.y.200, ...) and the monthly minor (x.y.0), is now cut from dev and merged into master. There is no separate bugfix line and no hotfix path off master. All PRs target dev. Workflows: - release-1: from_branch keeps its input for existing callers but only offers dev; one version check accepts x.y.0 and x.y.100; drop the dead release/ guard on the push step; reword the chart -dev strip messages. - release-3: remove the master-into-bugfix merge-back job. - Drop bugfix from branch filters and conditions in test-helm-chart, unit-tests, ci-warm-caches, migration-graph, ruff, detect-merge-conflicts and renovate. - gh-pages: publish on pushes to master and dev, with a concurrency group so the two deploys queue instead of racing. - release_drafter_valentijn: the previous release tag is now the normal changeset start; update the input help text. Docs and agent guidance: - PR template, CONTRIBUTING and RELEASING describe the single dev line. - branching-model page and its 7 translations: dev -> release -> master diagram, patch releases from dev, fixed workflow links. - AGENTS.md, branch-guard.sh and the repo skills: all work on dev, master stays gated behind explicit confirmation, one milestone query. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Release PRs (release/<version>) and merge-backs (master-into-dev/<version>-<dev>) are merged as soon as they are conflict-free, without waiting for CI. Guard the root jobs of the test, lint and verification workflows so they skip on those PRs when the release-management label is present, and on pushes of such branches or of GitHub's merge commit for such a PR. Unit Tests Complete skips with them instead of reporting a failure. RELEASING.md drops the "wait for the tests" steps. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The release PR head is now release/merge-dev-into-master-<version> (was release/<version>) and the merge-back head is release/merge-master-into-dev-<version> (was master-into-dev/<version>-<dev>). The version suffix keeps each release's branches unique. CI now skips on the same rule as the other DefectDojo repositories: a pull request whose head starts with release/merge- AND that has the release-management label, or on push a release/merge-* branch or GitHub's merge commit for such a PR. RELEASING.md and the branching-model pages use the new names. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Retires the
bugfixbranch. From 3.4.0 on, every release comes fromdev: the weekly patch (x.y.100,x.y.200, ...) and the monthly minor (x.y.0) alike. The schedule stays the same. All PRs, bug fixes and features, targetdev, and a merged PR ships in the next scheduled release.Release workflows:
release-1-create-pr.yml:from_branchnow has one option,dev. The input stays so existing callers that pass-f from_branch=devkeep working. One version check accepts bothx.y.0andx.y.<1-3 digits>.release-3-master-into-dev.yml: the job that opened themaster -> bugfixmerge-back is removed. The chart version flow already works for every release: the release strips-dev, and the merge-back bumps the patch and adds-devagain.release_drafter_valentijn.yml: input help text only. The patch-range workaround existed because patches came from a separate branch.CI and docs deploy:
bugfixis dropped from the branch filters inunit-tests.yml,test-helm-chart.yml,ci-warm-caches.yml,migration-graph.yml,ruff.yml,detect-merge-conflicts.yamlandrenovate.yaml.gh-pages.ymlnow deploys on pushes tomasteranddev, so docs go live when they merge. A concurrency group stops a master deploy and a dev deploy from racing.Contributor docs:
readme-docs/CONTRIBUTING.mdandreadme-docs/RELEASING.mddescribe the single branch.release-1/2/3files. The translations were edited by hand and have not been checked by native speakers.AGENTS.md, the branch-guard hook and the two Claude skills now say all work goes todev. The guard still blocks edits onmasteruntil someone confirms.CI on release merges
Release PRs and merge-backs are now merged as soon as they are conflict-free, without waiting for CI, to save time and runner cost.
release/merge-dev-into-master-<version>(wasrelease/<version>), and the merge-back fromrelease/merge-master-into-dev-<version>(wasmaster-into-dev/<version>-<dev>).release/merge-AND the PR has therelease-managementlabel. Both conditions must hold.release-1andrelease-3already add that label.ruff.ymlandmigration-graph.ymlskip a push to such a branch, or GitHub's merge commit for such a PR.Unit Tests Completenow skips too, instead of failing, when its inputs were skipped this way.ci-warm-caches.ymlstill runs, since it only builds the cache that later PRs use.Rollout
This should merge into
devbefore the 3.4.0 release (due 2026-10-05). Two things stay the same until then:master, including the lastbugfix -> devmerge. Its release PR is what carries these changes tomaster.After 3.4.0, a maintainer needs to change some repository settings:
bugfixPRs todevbefore rebasing them.dev.bugfixfrom the "Branch Protection" ruleset.bugfix, lock it, then delete it.Checks
bash -npasses on the hook, and I ran the hook by hand in session, edit and commit modes against dev, a topic branch, and a detached HEAD at master.