From 1b35792c77d71c3529e177ced25e34ba6371f226 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Mon, 19 Aug 2024 14:17:52 +0200
Subject: [PATCH] Build Spring Data Relational 3.2.9 docs from a branch.

---
 .github/workflows/antora-site.yml | 12 +++++++-----
 playbooks/jpa.yml                 |  7 ++++---
 playbooks/relational.yml          |  7 ++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/antora-site.yml b/.github/workflows/antora-site.yml
index b369f51..b74998a 100644
--- a/.github/workflows/antora-site.yml
+++ b/.github/workflows/antora-site.yml
@@ -26,7 +26,7 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
     - name: Setup Maven Action
-      uses: s4u/setup-maven-action@v1.13.0
+      uses: s4u/setup-maven-action@v1.14.0
       with:
         java-version: 17
     - name: Set up refname build
@@ -47,15 +47,17 @@ jobs:
           package-lock.json
         key: ${{ runner.os }}-nodejs-${{ hashFiles('pom.xml') }}
     - name: Cache Maven
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-maven
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-maven
     - name: Cache Antora
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache
-        key: ${{ runner.os }}-antora-${{ github.event.inputs.module }}
+        key: ${{ runner.os }}-antora-${{ github.event.inputs.module }}-${{ hashFiles('**/*.yml') }}
+        restore-keys: ${{ runner.os }}-antora-${{ github.event.inputs.module }}
     - name: Run Antora
       run: ./mvnw -B antora -Dspring-data.module=${{ github.event.inputs.module }}
 #    - name: Archive results
diff --git a/playbooks/jpa.yml b/playbooks/jpa.yml
index 15bd3fd..43e020f 100644
--- a/playbooks/jpa.yml
+++ b/playbooks/jpa.yml
@@ -13,14 +13,15 @@ content:
     - url: https://github.com/spring-projects/spring-data-jpa
       # Refname matching:
       # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
-      branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ]
-      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1' ]
+      # docs/3.2.9 and 3.3.3 tag contains invalid references, so we build 3.2.9 from a docs fix branch.
+      branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x', 'docs/3.2.9', 'docs/3.3.3' ]
+      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)', '!(3.2.*)', '!(3.3.*)' ]
       start_path: src/main/antora
     - url: https://github.com/spring-projects/spring-data-commons
       # Refname matching:
       # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
       branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ]
-      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ]
+      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)', '!3.2.0-M1', '!3.2.0-M2' ]
       start_path: src/main/antora
 asciidoc:
   attributes:
diff --git a/playbooks/relational.yml b/playbooks/relational.yml
index ea90a42..8a62028 100644
--- a/playbooks/relational.yml
+++ b/playbooks/relational.yml
@@ -13,14 +13,15 @@ content:
     - url: https://github.com/spring-projects/spring-data-relational
       # Refname matching:
       # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
-      branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ]
-      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ]
+      # docs/3.2.9 tag contains invalid references, so we build 3.2.9 from a docs fix branch.
+      branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x', 'docs/3.2.9' ]
+      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)', '!(3.2.*)' ]
       start_path: src/main/antora
     - url: https://github.com/spring-projects/spring-data-commons
       # Refname matching:
       # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
       branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ]
-      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ]
+      tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)', '!3.2.0-M1', '!3.2.0-M2' ]
       start_path: src/main/antora
 asciidoc:
   attributes: