From 4f5052c717545e5e7accf3125cfb6b183b0f890e Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 18 Jul 2025 15:24:00 +0900 Subject: [PATCH 1/2] workflows: Enable unit tests in 4.0 branch Signed-off-by: Hiroshi Hatake --- .github/workflows/unit-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 2fc7ee8844e..a5b79f8cb27 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -22,6 +22,7 @@ on: - 'examples/**' branches: - master + - 4.0 - 3.2 - 3.1 - 3.0 From e4c95f2f1196986dea23613e71bd7cd7d35cd83f Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 18 Jul 2025 15:31:22 +0900 Subject: [PATCH 2/2] workflows: Prepare to change upcoming 4.1 release We still need to release 4.0 as a stable version. So, we still needed to use latest tag as a 4.0.x versions. Signed-off-by: Hiroshi Hatake --- .github/workflows/staging-release.yaml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/staging-release.yaml b/.github/workflows/staging-release.yaml index 0d971ec8d8a..327939d2755 100644 --- a/.github/workflows/staging-release.yaml +++ b/.github/workflows/staging-release.yaml @@ -502,7 +502,9 @@ jobs: TAG: ${{ steps.get-tag.outputs.tag }} staging-release-images-latest-tags: - # Only update latest tags for 4.0 releases + # NOTE: Before releasing 4.1, we need to change '4.' to '4.1' + # Meanwhile, we need to release 4.0 series as stable releases. + # Only update latest tags for 4. releases if: startsWith(github.event.inputs.version, '4.') name: Release latest Linux container images runs-on: ubuntu-latest @@ -829,7 +831,7 @@ jobs: target_commitish: '3.2' make_latest: false - - name: Release 4.0 and latest + - name: Release 4.0 - not latest uses: softprops/action-gh-release@v2 if: startsWith(inputs.version, '4.0') with: @@ -840,6 +842,17 @@ jobs: tag_name: v${{ inputs.version }} make_latest: true + - name: Release 4.1 and latest + uses: softprops/action-gh-release@v2 + if: startsWith(inputs.version, '4.1') + 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 runs-on: ubuntu-22.04 @@ -948,13 +961,20 @@ jobs: token: ${{ secrets.GH_PA_TOKEN }} ref: 3.2 - - name: Release 4.0 and latest + - name: Release 4.0 - not latest if: startsWith(inputs.version, '4.0') uses: actions/checkout@v4 with: repository: fluent/fluent-bit-docs token: ${{ secrets.GH_PA_TOKEN }} + - name: Release 4.1 and latest + if: startsWith(inputs.version, '4.1') + uses: actions/checkout@v4 + with: + repository: fluent/fluent-bit-docs + token: ${{ secrets.GH_PA_TOKEN }} + - name: Ensure we have the script we need run: | if [[ ! -f update-release-version-docs.sh ]] ; then