workflows: add correct WAMR option

Signed-off-by: Patrick Stephens <[email protected]>
fluent · Jan 27, 2025 · 9ea2818 · 9ea2818
1 parent e939047
commit 9ea2818
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/call-build-images.yaml b/.github/workflows/call-build-images.yaml
@@ -129,7 +129,7 @@ jobs:
           build-args: |
             FLB_NIGHTLY_BUILD=${{ inputs.unstable }}
             RELEASE_VERSION=${{ inputs.version }}
-            WAMR_BUILD_TARGET=${{ (contains(matrix.platform, 'arm/v7') && 'ARMV7') || (contains(matrix.platform, 'arm') && 'ARM') || 'X86_64' }}
+            WAMR_BUILD_TARGET=${{ (contains(matrix.platform, 'arm/v7') && 'ARMV7') || '' }}
 
       - name: Export ${{ matrix.target }} digest
         run: |

diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
@@ -68,9 +68,12 @@ FROM builder-base AS builder
 WORKDIR /src/fluent-bit/build/
 
 # Required to be set to ARMV7 for that target
-ARG WAMR_BUILD_TARGET=X86_64
+ARG WAMR_BUILD_TARGET
+ARG EXTRA_CMAKE_FLAGS
+ENV EXTRA_CMAKE_FLAGS=${EXTRA_CMAKE_FLAGS}
 
-RUN cmake -DFLB_RELEASE=On \
+RUN [ -n "${WAMR_BUILD_TARGET:-}" ] && EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DWAMR_BUILD_TARGET=$WAMR_BUILD_TARGET"; \
+    cmake -DFLB_RELEASE=On \
     -DFLB_JEMALLOC=On \
     -DFLB_TLS=On \
     -DFLB_SHARED_LIB=Off \
@@ -83,7 +86,7 @@ RUN cmake -DFLB_RELEASE=On \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
     -DFLB_LOG_NO_CONTROL_CHARS=On \
     -DFLB_CHUNK_TRACE="$FLB_CHUNK_TRACE" \
-    -DWAMR_BUILD_TARGET="${WAMR_BUILD_TARGET}" \
+    $EXTRA_CMAKE_FLAGS \
     ..
 
 ARG CFLAGS="-v"