From bb7e62b98acf2c5e92e5ba1755db43f794b49a14 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 29 May 2024 14:38:21 +0200 Subject: [PATCH] DEV: patchbot: prepare for new version 3.1-dev The bot will now load the prompt for the upcoming 3.1 version so we have to rename the files and update their contents to match the current version. --- ...t15-3.0-mist7bv2-pfx.txt => prompt15-3.1-mist7bv2-pfx.txt} | 4 ++-- ...t15-3.0-mist7bv2-sfx.txt => prompt15-3.1-mist7bv2-sfx.txt} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename dev/patchbot/prompts/{prompt15-3.0-mist7bv2-pfx.txt => prompt15-3.1-mist7bv2-pfx.txt} (96%) rename dev/patchbot/prompts/{prompt15-3.0-mist7bv2-sfx.txt => prompt15-3.1-mist7bv2-sfx.txt} (96%) diff --git a/dev/patchbot/prompts/prompt15-3.0-mist7bv2-pfx.txt b/dev/patchbot/prompts/prompt15-3.1-mist7bv2-pfx.txt similarity index 96% rename from dev/patchbot/prompts/prompt15-3.0-mist7bv2-pfx.txt rename to dev/patchbot/prompts/prompt15-3.1-mist7bv2-pfx.txt index 2d97cb915..3120167aa 100644 --- a/dev/patchbot/prompts/prompt15-3.0-mist7bv2-pfx.txt +++ b/dev/patchbot/prompts/prompt15-3.1-mist7bv2-pfx.txt @@ -14,11 +14,11 @@ that are picked from the development branch. Branches are numbered in 0.1 increments. Every 6 months, upon a new major release, the development branch enters maintenance and a new development branch is created with a new, higher version. The current development branch is -3.0-dev, and maintenance branches are 2.9 and below. +3.1-dev, and maintenance branches are 3.0 and below. Fixes created in the development branch for issues that were introduced in an earlier branch are applied in descending order to each and every version till -that branch that introduced the issue: 2.9 first, then 2.8, then 2.7 and so +that branch that introduced the issue: 3.0 first, then 2.9, then 2.8 and so on. This operation is called "backporting". A fix for an issue is never backported beyond the branch that introduced the issue. An important point is that the project maintainers really aim at zero regression in maintenance diff --git a/dev/patchbot/prompts/prompt15-3.0-mist7bv2-sfx.txt b/dev/patchbot/prompts/prompt15-3.1-mist7bv2-sfx.txt similarity index 96% rename from dev/patchbot/prompts/prompt15-3.0-mist7bv2-sfx.txt rename to dev/patchbot/prompts/prompt15-3.1-mist7bv2-sfx.txt index 1db18f424..dd4280bd6 100644 --- a/dev/patchbot/prompts/prompt15-3.0-mist7bv2-sfx.txt +++ b/dev/patchbot/prompts/prompt15-3.1-mist7bv2-sfx.txt @@ -17,7 +17,7 @@ Finally, based on your analysis, give your general conclusion as "Conclusion: X" where X is a single word among: - "yes", if you recommend to backport the patch right now either because it explicitly states this or because it's a fix for a bug that affects - a maintenance branch (2.9 or lower); + a maintenance branch (3.0 or lower); - "wait", if this patch explicitly mentions that it must be backported, but only after waiting some time. - "no", if nothing clearly indicates a necessity to backport this patch (e.g.