From b50c55707658d523bdb195100d56603fc412fb9a Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Tue, 19 Dec 2023 10:35:34 +0000 Subject: [PATCH 1/4] scripts: fix snap update call Signed-off-by: Patrick Stephens --- update_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_version.sh b/update_version.sh index 998db1c2ade..95047797eb9 100755 --- a/update_version.sh +++ b/update_version.sh @@ -72,7 +72,7 @@ sed_wrapper -i "s/ARG RELEASE_VERSION=[0-9].[0-9].[0-9]/ARG RELEASE_VERSION=$NEW # Snap -sed_wrapper -i "s/version: '[0-9].[0-9].[0-9]'/version: '$NEW_VERSION'/g" "$SCRIPT_DIR"/snap/snapcraft.yaml +sed_wrapper -i "s/version: '[0-9]+\.[0-9]+\.[0-9]+'/version: '$NEW_VERSION'/g" "$SCRIPT_DIR"/snap/snapcraft.yaml # Bitbake / Yocto if [[ -f "fluent-bit-$NEW_VERSION.bb" ]]; then From cb3ed31709429e46137f3bd69fdb00165ee03c8f Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Tue, 19 Dec 2023 10:36:07 +0000 Subject: [PATCH 2/4] build: bump to v2.2.0 Signed-off-by: Patrick Stephens --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38f963a60e8..8007e617a4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # Fluent Bit Version set(FLB_VERSION_MAJOR 2) set(FLB_VERSION_MINOR 2) -set(FLB_VERSION_PATCH 1) +set(FLB_VERSION_PATCH 0) set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}") set(CMAKE_POSITION_INDEPENDENT_CODE ON) From c9d588005eb18e4987173eabf2f846ec774b301f Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Tue, 19 Dec 2023 10:36:12 +0000 Subject: [PATCH 3/4] dockerfile: bump to v2.2.0 Signed-off-by: Patrick Stephens --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 0c39be4fe41..b49e6c92b5e 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -11,7 +11,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=2.2.1 +ARG RELEASE_VERSION=2.2.0 # For multi-arch builds - assumption is running on an AMD64 host FROM multiarch/qemu-user-static:x86_64-arm as qemu-arm32 From de4f281cd26c5785b443f48eff664260626feb34 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Tue, 19 Dec 2023 10:38:54 +0000 Subject: [PATCH 4/4] scripts: fix snap update call Signed-off-by: Patrick Stephens --- CMakeLists.txt | 2 +- dockerfiles/Dockerfile | 2 +- snap/snapcraft.yaml | 2 +- update_version.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8007e617a4c..38f963a60e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # Fluent Bit Version set(FLB_VERSION_MAJOR 2) set(FLB_VERSION_MINOR 2) -set(FLB_VERSION_PATCH 0) +set(FLB_VERSION_PATCH 1) set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}") set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index b49e6c92b5e..0c39be4fe41 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -11,7 +11,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=2.2.0 +ARG RELEASE_VERSION=2.2.1 # 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/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6b5e42d0a19..8d292d62c70 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: fluent-bit base: core18 -version: '2.1.10' +version: '2.2.1' summary: High performance logs and stream processor description: | Fluent Bit is a high performance log processor and stream processor for Linux. diff --git a/update_version.sh b/update_version.sh index 95047797eb9..b93eeb2ea61 100755 --- a/update_version.sh +++ b/update_version.sh @@ -72,7 +72,7 @@ sed_wrapper -i "s/ARG RELEASE_VERSION=[0-9].[0-9].[0-9]/ARG RELEASE_VERSION=$NEW # Snap -sed_wrapper -i "s/version: '[0-9]+\.[0-9]+\.[0-9]+'/version: '$NEW_VERSION'/g" "$SCRIPT_DIR"/snap/snapcraft.yaml +sed_wrapper -i -E "s/version: '[0-9]+\.[0-9]+\.[0-9]+'/version: '$NEW_VERSION'/g" "$SCRIPT_DIR"/snap/snapcraft.yaml # Bitbake / Yocto if [[ -f "fluent-bit-$NEW_VERSION.bb" ]]; then