From a347825e036c672abc82f5cbf2671c0af00dd6da Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 15 Jun 2024 14:34:01 +0200 Subject: [PATCH] Add reference to preparing next major release doc; reference automated workflow from freeze docs (#422) * Add reference to preparing next major release doc. * Reference automated workflow from freeze docs. * Reformulate. --- docs/automated-process.md | 4 ++++ docs/new-ansible-and-freezes.md | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/docs/automated-process.md b/docs/automated-process.md index b4c711805e..27f3af60d0 100644 --- a/docs/automated-process.md +++ b/docs/automated-process.md @@ -149,3 +149,7 @@ next to the release version: 2. Set `existing-branch` to the branch you pushed to the `ansible-build-data` repository. + +When the new major release has been done, remember to prepare the directory for +the next major Ansible release. How to do this is described in [Setting up for a +new major release](new-ansible-and-freezes.md#setting-up-for-a-new-major-release). diff --git a/docs/new-ansible-and-freezes.md b/docs/new-ansible-and-freezes.md index 09b087c5ab..a50dca7f40 100644 --- a/docs/new-ansible-and-freezes.md +++ b/docs/new-ansible-and-freezes.md @@ -95,6 +95,12 @@ TODO: Improve the release playbook to support this case without requiring extra Beyond the regular [Ansible Release Process](release-process.md), X.Y.0 releases require special handling before running the release playbook. +!!! note + This can be done in a simpler fashion when using the [automated release + process](automated-process.md). See the regular automated workflow for + versions up to rc1, and the [Special builds](automated-process.md#special-builds) + section for further release candidates and for the final major release. + 1. Determine the previous and the current releases ``` sh