release: Update to v4.0.12 (#10935)

* scripts: Handle two or more digits for patch version

Signed-off-by: Hiroshi Hatake <[email protected]>

* build: bump to v4.0.12

Signed-off-by: Hiroshi Hatake <[email protected]>

* dockerfile: bump to v4.0.12

Signed-off-by: Hiroshi Hatake <[email protected]>

* snap: bump to v4.0.12

Signed-off-by: Hiroshi Hatake <[email protected]>

* bitbake: bump to v4.0.12

Signed-off-by: Hiroshi Hatake <[email protected]>

---------

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 # Fluent Bit Version
 set(FLB_VERSION_MAJOR  4)
 set(FLB_VERSION_MINOR  0)
-set(FLB_VERSION_PATCH  11)
+set(FLB_VERSION_PATCH  12)
 set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

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=4.0.11
+ARG RELEASE_VERSION=4.0.12
 
 # For multi-arch builds - assumption is running on an AMD64 host
 FROM multiarch/qemu-user-static:x86_64-arm AS qemu-arm32

fluent-bit-4.0.11.bb renamed to fluent-bit-4.0.12.bb

@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
 
 PR = "r0"
-PV = "4.0.11"
+PV = "4.0.12"
 
 SRCREV = "v${PV}"
 SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: fluent-bit
 base: core18
-version: '4.0.11'
+version: '4.0.12'
 summary: High performance logs and stream processor
 description: |
   Fluent Bit is a high performance log processor and stream processor for Linux.

update_version.sh

@@ -62,25 +62,32 @@ if [[ -z "$patch" ]]; then
 fi
 
 # Build version
-sed_wrapper -i "s/FLB_VERSION_MAJOR  [0-9]/FLB_VERSION_MAJOR  $major/g" "$SCRIPT_DIR"/CMakeLists.txt
-sed_wrapper -i "s/FLB_VERSION_MINOR  [0-9]/FLB_VERSION_MINOR  $minor/g" "$SCRIPT_DIR"/CMakeLists.txt
-sed_wrapper -i "s/FLB_VERSION_PATCH  [0-9]/FLB_VERSION_PATCH  $patch/g" "$SCRIPT_DIR"/CMakeLists.txt
+sed_wrapper -i -E "s/(FLB_VERSION_MAJOR[[:space:]]+)[0-9]+/\1$major/g" "$SCRIPT_DIR"/CMakeLists.txt
+sed_wrapper -i -E "s/(FLB_VERSION_MINOR[[:space:]]+)[0-9]+/\1$minor/g" "$SCRIPT_DIR"/CMakeLists.txt
+sed_wrapper -i -E "s/(FLB_VERSION_PATCH[[:space:]]+)[0-9]+/\1$patch/g" "$SCRIPT_DIR"/CMakeLists.txt
 
 # Dockerfile
-sed_wrapper -i "s/ARG RELEASE_VERSION=[0-9].[0-9].[0-9]/ARG RELEASE_VERSION=$NEW_VERSION/g" "$SCRIPT_DIR"/dockerfiles/Dockerfile
-sed_wrapper -i "s/ARG RELEASE_VERSION=[0-9].[0-9].[0-9]/ARG RELEASE_VERSION=$NEW_VERSION/g" "$SCRIPT_DIR"/dockerfiles/Dockerfile*
+sed_wrapper -i -E "s/(ARG RELEASE_VERSION=)[0-9]+\.[0-9]+\.[0-9]+/\1$NEW_VERSION/g" "$SCRIPT_DIR"/dockerfiles/Dockerfile
+sed_wrapper -i -E "s/(ARG RELEASE_VERSION=)[0-9]+\.[0-9]+\.[0-9]+/\1$NEW_VERSION/g" "$SCRIPT_DIR"/dockerfiles/Dockerfile*
 
 
 # Snap
 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
+if [[ -f "$SCRIPT_DIR/fluent-bit-$NEW_VERSION.bb" ]]; then
     echo "ERROR: existing fluent-bit-$NEW_VERSION.bb"
     exit 1
 else
-    mv -vf "$SCRIPT_DIR"/fluent-bit-*.*.*.bb "fluent-bit-$NEW_VERSION.bb"
-    sed_wrapper -i -E "s/^PV =.*$/PV = \"$NEW_VERSION\"/g" "fluent-bit-$NEW_VERSION.bb"
+    old_bb=$(find "$SCRIPT_DIR" -maxdepth 1 -type f -name 'fluent-bit-[0-9]*.[0-9]*.[0-9]*.bb' | head -n1)
+    if [[ -z "$old_bb" ]]; then
+        echo "ERROR: no existing .bb file found" >&2
+        exit 1
+    fi
+    mv -vf "$old_bb" "$SCRIPT_DIR/fluent-bit-$NEW_VERSION.bb"
+    sed_wrapper -i -E \
+      "s/^PV *= *\"?[0-9]+\.[0-9]+\.[0-9]+\"?/PV = \"$NEW_VERSION\"/g" \
+      "$SCRIPT_DIR/fluent-bit-$NEW_VERSION.bb"
 fi
 
 if [[ "${DISABLE_COMMIT:-no}" == "no" ]]; then