From 1132f15d76d4e84616e32b7218bc6bc02bb6d88d Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Mon, 30 Sep 2024 12:00:05 +0100 Subject: [PATCH 1/2] workflows: 3.2 release from master support Signed-off-by: Patrick Stephens --- .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 From 96747b40e810abbc7a5d0f8adeefc917b9e998c0 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Mon, 30 Sep 2024 12:00:46 +0100 Subject: [PATCH 2/2] version: update to 3.2.0 Signed-off-by: Patrick Stephens --- dockerfiles/Dockerfile | 2 +- fluent-bit-3.1.7.bb => fluent-bit-3.2.0.bb | 2 +- snap/snapcraft.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename fluent-bit-3.1.7.bb => fluent-bit-3.2.0.bb (99%) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index f068611e654..9db1d638c62 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -13,7 +13,7 @@ # docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7,linux/s390x" -f ./dockerfiles/Dockerfile.multiarch --build-arg FLB_TARBALL=https://github.com/fluent/fluent-bit/archive/v1.8.11.tar.gz ./dockerfiles/ # Set this to the current release version: it gets done so as part of the release. -ARG RELEASE_VERSION=3.1.7 +ARG RELEASE_VERSION=3.2.0 # For multi-arch builds - assumption is running on an AMD64 host FROM multiarch/qemu-user-static:x86_64-arm AS qemu-arm32 diff --git a/fluent-bit-3.1.7.bb b/fluent-bit-3.2.0.bb similarity index 99% rename from fluent-bit-3.1.7.bb rename to fluent-bit-3.2.0.bb index 6c69bacaf6e..d9cb59aad6b 100644 --- a/fluent-bit-3.1.7.bb +++ b/fluent-bit-3.2.0.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" PR = "r0" -PV = "3.1.7" +PV = "3.2.0" SRCREV = "v${PV}" SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4cdc9c82280..c2220ee029d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: fluent-bit base: core18 -version: '3.1.7' +version: '3.2.0' summary: High performance logs and stream processor description: | Fluent Bit is a high performance log processor and stream processor for Linux.