@@ -167,8 +167,7 @@ jobs:
167167 os : [ubuntu-22.04]
168168 platform : [android, linux]
169169 exclude :
170- # incompatible feature and platform
171- # incompatible mode and feature
170+ # incompatible feature and platform and mode
172171 # MULTI_MODULE only on INTERP mode and AOT mode
173172 - make_options_run_mode : $FAST_JIT_BUILD_OPTIONS
174173 make_options_feature : " -DWAMR_BUILD_MULTI_MODULE=1"
@@ -263,11 +262,11 @@ jobs:
263262 llvm_cache_key : ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
264263 # classic interp , fast-jit, multi-tier-jit mode doesn't support SIMD
265264 - make_options_run_mode : $CLASSIC_INTERP_BUILD_OPTIONS
266- make_options_feature : " -DWAMR_BUILD_SIMD=0"
265+ extra_options : " -DWAMR_BUILD_SIMD=0"
267266 - make_options_run_mode : $FAST_JIT_BUILD_OPTIONS
268- make_options_feature : " -DWAMR_BUILD_SIMD=0"
267+ extra_options : " -DWAMR_BUILD_SIMD=0"
269268 - make_options_run_mode : $MULTI_TIER_JIT_BUILD_OPTIONS
270- make_options_feature : " -DWAMR_BUILD_SIMD=0"
269+ extra_options : " -DWAMR_BUILD_SIMD=0"
271270 steps :
272271 - name : checkout
273272 uses : actions/checkout@v5
@@ -294,7 +293,7 @@ jobs:
294293 if : matrix.platform == 'linux'
295294 run : |
296295 mkdir build && cd build
297- cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }}
296+ cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} ${{ matrix.extra_options}}
298297 cmake --build . --config Release --parallel 4
299298 working-directory : product-mini/platforms/${{ matrix.platform }}
300299
@@ -427,17 +426,16 @@ jobs:
427426 - os : ubuntu-22.04
428427 llvm_cache_key : ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
429428 # classic interp and fast jit mode doesn't support SIMD
430- - make_options_run_mode : $CLASSIC_INTERP_BUILD_OPTIONS
431- make_options_feature : " -DWAMR_BUILD_SIMD=0"
432- - make_options_run_mode : $FAST_JIT_BUILD_OPTIONS
433- make_options_feature : " -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
434- - make_options_run_mode : $MULTI_TIER_JIT_BUILD_OPTIONS
435- make_options_feature : " -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
436- # MULTI_MODULE only on INTERP mode and AOT mode
437- - make_options_run_mode : $LLVM_LAZY_JIT_BUILD_OPTIONS
438- make_options_feature : " -DWAMR_BUILD_MULTI_MODULE=0"
439- - make_options_run_mode : $LLVM_EAGER_JIT_BUILD_OPTIONS
440- make_options_feature : " -DWAMR_BUILD_MULTI_MODULE=0"
429+ - make_options : $CLASSIC_INTERP_BUILD_OPTIONS
430+ extra_options : " -DWAMR_BUILD_SIMD=0"
431+ - make_options : $FAST_JIT_BUILD_OPTIONS
432+ extra_options : " -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
433+ - make_options : $MULTI_TIER_JIT_BUILD_OPTIONS
434+ extra_options : " -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
435+ - make_options : $LLVM_LAZY_JIT_BUILD_OPTIONS
436+ extra_options : " -DWAMR_BUILD_MULTI_MODULE=0"
437+ - make_options : $LLVM_EAGER_JIT_BUILD_OPTIONS
438+ extra_options : " -DWAMR_BUILD_MULTI_MODULE=0"
441439
442440 steps :
443441 - name : checkout
@@ -476,7 +474,7 @@ jobs:
476474 - name : Build Sample [wasm-c-api]
477475 run : |
478476 VERBOSE=1
479- cmake -S . -B build ${{ matrix.make_options }}
477+ cmake -S . -B build ${{ matrix.make_options }} ${{ matrix.extra_options }}
480478 cmake --build build --config Debug --parallel 4
481479 ctest --test-dir build --output-on-failure
482480 working-directory : samples/wasm-c-api
0 commit comments