From f3e8ba555eef005cb643d72f010e04c779009016 Mon Sep 17 00:00:00 2001 From: edsiper Date: Thu, 28 Sep 2023 07:55:48 +0000 Subject: [PATCH 1/2] release: update to 2.1.11 Signed-off-by: GitHub --- CMakeLists.txt | 2 +- dockerfiles/Dockerfile | 2 +- fluent-bit-2.1.10.bb => fluent-bit-2.1.11.bb | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename fluent-bit-2.1.10.bb => fluent-bit-2.1.11.bb (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae853815b70..50e300a02ce 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 1) -set(FLB_VERSION_PATCH 10) +set(FLB_VERSION_PATCH 110) 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 bc0c06c5517..c74aaaf3430 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -11,7 +11,7 @@ # docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7" -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.1.10 +ARG RELEASE_VERSION=2.1.1110 # 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-2.1.10.bb b/fluent-bit-2.1.11.bb similarity index 100% rename from fluent-bit-2.1.10.bb rename to fluent-bit-2.1.11.bb From d909f8e1b99dbc6a9faf6235d480447c0a1d51d1 Mon Sep 17 00:00:00 2001 From: Pat Date: Thu, 28 Sep 2023 08:59:51 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Signed-off-by: Pat --- CMakeLists.txt | 2 +- dockerfiles/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50e300a02ce..44c5bd1c559 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 1) -set(FLB_VERSION_PATCH 110) +set(FLB_VERSION_PATCH 11) 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 c74aaaf3430..eca36af7dcd 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -11,7 +11,7 @@ # docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7" -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.1.1110 +ARG RELEASE_VERSION=2.1.11 # For multi-arch builds - assumption is running on an AMD64 host FROM multiarch/qemu-user-static:x86_64-arm as qemu-arm32