From 1132f15d76d4e84616e32b7218bc6bc02bb6d88d Mon Sep 17 00:00:00 2001
From: Patrick Stephens <pat@chronosphere.io>
Date: Mon, 30 Sep 2024 12:00:05 +0100
Subject: [PATCH] workflows: 3.2 release from master support

Signed-off-by: Patrick Stephens <pat@chronosphere.io>
---
 .github/workflows/cron-unstable-build.yaml |  7 +++
 .github/workflows/staging-release.yaml     | 51 +++++++++++-----------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/cron-unstable-build.yaml b/.github/workflows/cron-unstable-build.yaml
index 21900791754..b70da4121cc 100644
--- a/.github/workflows/cron-unstable-build.yaml
+++ b/.github/workflows/cron-unstable-build.yaml
@@ -14,6 +14,7 @@ on:
   schedule:
     - cron: "0 6 * * *" # master build
     - cron: "0 12 * * *" # 3.0 build
+    - cron: "0 18 * * *" # 3.1 build
 
 # We do not want a new unstable build to run whilst we are releasing the current unstable build.
 concurrency: unstable-build-release
@@ -57,6 +58,12 @@ jobs:
           echo "cron_branch=3.0" >> $GITHUB_ENV
         shell: bash
 
+      - name: 3.1 run
+        if: github.event_name == 'schedule' && github.event.schedule=='0 18 * * *'
+        run: |
+          echo "cron_branch=3.1" >> $GITHUB_ENV
+        shell: bash
+
       - name: Output the branch to use
         id: branch
         run: |
diff --git a/.github/workflows/staging-release.yaml b/.github/workflows/staging-release.yaml
index 303d60d5b92..b306dad4d18 100644
--- a/.github/workflows/staging-release.yaml
+++ b/.github/workflows/staging-release.yaml
@@ -502,9 +502,8 @@ jobs:
           TAG: ${{ steps.get-tag.outputs.tag }}
 
   staging-release-images-latest-tags:
-    # Only update latest tags for 3.1 releases
-    if: startsWith(github.event.inputs.version, '3.1')
-    # if: startsWith(github.event.inputs.version, '4.0')
+    # Only update latest tags for 3.2 releases
+    if: startsWith(github.event.inputs.version, '3.2')
     name: Release latest Linux container images
     runs-on: ubuntu-latest
     needs:
@@ -804,8 +803,7 @@ jobs:
           target_commitish: '3.0'
           make_latest: false
 
-      - name: Release 3.1 and latest
-        # TODO: change to 3.1 branch once 4.0 series is ready
+      - name: Release 3.1 - not latest
         uses: softprops/action-gh-release@v2
         if: startsWith(inputs.version, '3.1')
         with:
@@ -814,18 +812,19 @@ jobs:
           generate_release_notes: true
           name: "Fluent Bit ${{ inputs.version }}"
           tag_name: v${{ inputs.version }}
-          make_latest: true
+          target_commitish: '3.1'
+          make_latest: false
 
-      # - name: Release 4.0 and latest
-      #   uses: softprops/action-gh-release@v2
-      #   if: startsWith(inputs.version, '4.0')
-      #   with:
-      #     body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
-      #     draft: false
-      #     generate_release_notes: true
-      #     name: "Fluent Bit ${{ inputs.version }}"
-      #     tag_name: v${{ inputs.version }}
-      #     make_latest: true
+      - name: Release 3.2 and latest
+        uses: softprops/action-gh-release@v2
+        if: startsWith(inputs.version, '3.2')
+        with:
+          body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
+          draft: false
+          generate_release_notes: true
+          name: "Fluent Bit ${{ inputs.version }}"
+          tag_name: v${{ inputs.version }}
+          make_latest: true
 
   staging-release-windows-checksums:
     name: Get Windows checksums for new release
@@ -919,20 +918,20 @@ jobs:
           ref: 3.0
           token: ${{ secrets.GH_PA_TOKEN }}
 
-      - name: Release 3.1 and latest
-        # TODO: change to 3.1 branch once 4.0 series is ready
+      - name: Release 3.1 - not latest
         if: startsWith(inputs.version, '3.1')
         uses: actions/checkout@v4
         with:
           repository: fluent/fluent-bit-docs
+          ref: 3.1
           token: ${{ secrets.GH_PA_TOKEN }}
 
-      # - name: Release 4.0 and latest
-      #   if: startsWith(inputs.version, '4.0')
-      #   uses: actions/checkout@v4
-      #   with:
-      #     repository: fluent/fluent-bit-docs
-      #     token: ${{ secrets.GH_PA_TOKEN }}
+      - name: Release 3.2 and latest
+        if: startsWith(inputs.version, '3.2')
+        uses: actions/checkout@v4
+        with:
+          repository: fluent/fluent-bit-docs
+          token: ${{ secrets.GH_PA_TOKEN }}
 
       - name: Ensure we have the script we need
         run: |
@@ -1018,8 +1017,8 @@ jobs:
         with:
           ref: 3.1
 
-      - name: Release 4.0
-        if: startsWith(inputs.version, '4.0')
+      - name: Release 3.2
+        if: startsWith(inputs.version, '3.2')
         uses: actions/checkout@v4
         with:
           ref: master