From 2a7cd073f00cfc356efbbc3b5a033e9ab13040eb Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 24 Jul 2025 22:04:02 +0200 Subject: [PATCH 1/3] chore: Add release branches to the playbooks for release 25.7 --- antora-playbook.yml | 17 +++++++++++++++++ local-antora-playbook.yml | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 067e14cd0..ecc1e81eb 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -26,6 +26,7 @@ content: - url: . branches: - HEAD + - release-25.7 - release/25.3 - release/24.11 - release/24.7 @@ -43,6 +44,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -56,6 +58,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -68,6 +71,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -80,6 +84,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -93,6 +98,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -105,6 +111,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -117,6 +124,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -129,6 +137,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -141,6 +150,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -153,6 +163,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -165,6 +176,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -177,6 +189,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -193,6 +206,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -205,6 +219,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -217,6 +232,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -229,6 +245,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index 21b9ac69f..8a889275a 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -15,6 +15,7 @@ content: - url: ./ branches: - HEAD + - release-25.7 - release/25.3 - release/24.11 - release/24.7 @@ -32,6 +33,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -45,6 +47,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -57,6 +60,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -69,6 +73,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -82,6 +87,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -94,6 +100,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -106,6 +113,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -118,6 +126,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -130,6 +139,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -142,6 +152,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -154,6 +165,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -166,6 +178,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -182,6 +195,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -194,6 +208,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -206,6 +221,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 @@ -218,6 +234,7 @@ content: start_path: docs branches: - main + - release-25.7 - release-25.3 - release-24.11 - release-24.7 From 2c054b03088aabf32ef5f577bb0d48d1d4625786 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 24 Jul 2025 22:05:09 +0200 Subject: [PATCH 2/3] fix: The PR must be raised against the main branch --- scripts/publish-new-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/publish-new-version.sh b/scripts/publish-new-version.sh index d3ae39435..4515cd67c 100755 --- a/scripts/publish-new-version.sh +++ b/scripts/publish-new-version.sh @@ -143,13 +143,13 @@ if [ "$PUSH" = true ]; then git push -u origin "$PR_BRANCH" echo "" echo "The changes have been pushed to GitHub!" - echo "Raise the PR against the $BRANCH branch." + echo "Raise the PR against the main branch." echo "Click the link above to create the PR in GitHub, and then verify that the build works with Netlify previews." echo "Once the branch is merged, the changes will automatically be deployed and be live." else echo "" echo "Skipping push to origin." echo "Please push the branch manually and create PR." - echo "Raise the PR against the $BRANCH branch." + echo "Raise the PR against the main branch." echo "Once the changes are merged, they will automatically be deployed and be live." fi From 165675d906c9137f1bc1a9b6219a2ee41512b8c4 Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 25 Jul 2025 10:33:18 +0200 Subject: [PATCH 3/3] fix: Grep for both release[/-] in the netlify-fetch Makefile target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 388ff55b0..4daf40637 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ netlify-fetch: # fetch, because netlify does caching and we want to get the latest commits git fetch --all # checkout all release branches once, so we fetch the files - for remote in $(shell git branch -r | grep release/); do \ + for remote in $(shell git branch -r | grep -E 'release[/-]'); do \ git checkout --recurse-submodules "$${remote#origin/}" ; git pull; \ done # go back to the initial commit to start the build