feat: add release-specific targets

Signed-off-by: Patrick Stephens <pat@fluent.do>

Author: patrick-stephens

.github/workflows/build.yaml

@@ -28,7 +28,8 @@ jobs:
     outputs:
       build-type: ${{ steps.set-build-type.outputs.build-type }}
       date: ${{ steps.set-meta.outputs.date }}
-      linux-targets: ${{ steps.set-meta.outputs.linux-targets }}
+      # For PRs we can build for all possible targets but we use a reduced set for main/releases to keep costs/time down
+      linux-targets: ${{ github.event_name == 'pull_request' && steps.set-meta.outputs.pr-linux-targets || steps.set-meta.outputs.main-linux-targets }}
       version: ${{ steps.set-version.outputs.version }}
       oss-version: ${{ steps.set-oss-version.outputs.oss-version }}
     steps:
@@ -77,9 +78,13 @@ jobs:
         # Read from the file and remove newline characters: https://stackoverflow.com/a/64627966
         id: set-meta
         run: |
-          LINUX_TARGETS=$(cat "$JSON_FILE_NAME"|jq -c .linux_targets )
-          echo "linux-targets=$LINUX_TARGETS"
-          echo "linux-targets=$LINUX_TARGETS" >> $GITHUB_OUTPUT
+          PR_LINUX_TARGETS=$(cat "$JSON_FILE_NAME"|jq -c .linux_targets )
+          echo "pr-linux-targets=$PR_LINUX_TARGETS"
+          echo "pr-linux-targets=$PR_LINUX_TARGETS" >> $GITHUB_OUTPUT
+
+          MAIN_LINUX_TARGETS=$(cat "$JSON_FILE_NAME"|jq -c .release.linux_targets )
+          echo "main-linux-targets=$MAIN_LINUX_TARGETS"
+          echo "main-linux-targets=$MAIN_LINUX_TARGETS" >> $GITHUB_OUTPUT
         shell: bash
         env:
           JSON_FILE_NAME: build-config.json

build-config.json

@@ -16,6 +16,8 @@
     "centos/9.arm64v8",
     "centos/10",
     "centos/10.arm64v8",
+    "mariner/2",
+    "mariner/2.arm64v8",
     "rockylinux/8",
     "rockylinux/8.arm64v8",
     "rockylinux/9",
@@ -39,6 +41,32 @@
     "suse/15",
     "suse/15.arm64v8"
   ],
+  "release": {
+    "linux_targets": [
+      "amazonlinux/2023",
+      "amazonlinux/2023.arm64v8",
+      "centos/6",
+      "centos/7",
+      "centos/10",
+      "centos/10.arm64v8",
+      "rockylinux/8",
+      "rockylinux/8.arm64v8",
+      "rockylinux/9",
+      "rockylinux/9.arm64v8",
+      "rockylinux/10",
+      "rockylinux/10.arm64v8",
+      "debian/bookworm",
+      "debian/bookworm.arm64v8",
+      "debian/trixie",
+      "debian/trixie.arm64v8",
+      "ubuntu/22.04",
+      "ubuntu/22.04.arm64v8",
+      "ubuntu/24.04",
+      "ubuntu/24.04.arm64v8",
+      "suse/15",
+      "suse/15.arm64v8"
+    ]
+  },
   "kind_versions": [
     "v1.31.12",
     "v1.32.8",

custom/packaging/distros/mariner/Dockerfile

@@ -43,28 +43,12 @@ WORKDIR /source/fluent-bit/build/
 ARG CFLAGS
 ARG CMAKE_INSTALL_PREFIX=/opt/fluent-do-agent/
 ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
-ARG FLB_TD=Off
-ARG FLB_RELEASE=On
-ARG FLB_TRACE=On
-ARG FLB_SQLDB=On
-ARG FLB_HTTP_SERVER=On
-ARG FLB_OUT_KAFKA=On
-ARG FLB_JEMALLOC=On
-ARG FLB_OUT_PGSQL=On
 
 RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DCMAKE_RULE_MESSAGES:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
     -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
-    -DFLB_RELEASE="$FLB_RELEASE" \
-    -DFLB_TRACE="$FLB_TRACE" \
-    -DFLB_TD="$FLB_TD" \
-    -DFLB_SQLDB="$FLB_SQLDB" \
-    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
-    -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
-    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
     -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
-    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
     ../
 
 VOLUME [ "/output" ]

source/packaging/distros/mariner/Dockerfile

@@ -43,28 +43,12 @@ WORKDIR /source/fluent-bit/build/
 ARG CFLAGS
 ARG CMAKE_INSTALL_PREFIX=/opt/fluent-do-agent/
 ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
-ARG FLB_TD=Off
-ARG FLB_RELEASE=On
-ARG FLB_TRACE=On
-ARG FLB_SQLDB=On
-ARG FLB_HTTP_SERVER=On
-ARG FLB_OUT_KAFKA=On
-ARG FLB_JEMALLOC=On
-ARG FLB_OUT_PGSQL=On
 
 RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DCMAKE_RULE_MESSAGES:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
     -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
-    -DFLB_RELEASE="$FLB_RELEASE" \
-    -DFLB_TRACE="$FLB_TRACE" \
-    -DFLB_TD="$FLB_TD" \
-    -DFLB_SQLDB="$FLB_SQLDB" \
-    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
-    -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
-    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
     -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
-    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
     ../
 
 VOLUME [ "/output" ]