Skip to content

Commit 1ac09ed

Browse files
wenyonghwenyongh
committed
Merge branch main into dev/separate_app_framework
2 parents 68af9f8 + 2eb6006 commit 1ac09ed

File tree

126 files changed

+4309
-1408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+4309
-1408
lines changed

‎.github/workflows/build_docker_images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Build and save Docker image(wasm-debug-server:${{ inputs.ver_num }}) to tar file
2727
run: |

‎.github/workflows/build_iwasm_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
build:
3636
runs-on: ${{ inputs.runner }}
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939

4040
- name: get cached LLVM libraries
4141
id: retrieve_llvm_libs
42-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4343
with:
4444
path: |
4545
./core/deps/llvm/build/bin

‎.github/workflows/build_llvm_libraries.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: checkout
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: install dependencies
3737
run: /usr/bin/env python3 -m pip install -r requirements.txt
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Cache LLVM libraries
5454
id: retrieve_llvm_libs
55-
uses: actions/cache@v3
55+
uses: actions/cache@v4
5656
with:
5757
path: |
5858
./core/deps/llvm/build/bin
@@ -62,15 +62,15 @@ jobs:
6262
./core/deps/llvm/build/share
6363
key: ${{ steps.create_lib_cache_key.outputs.key}}
6464

65-
- uses: actions/cache@v3
65+
- uses: actions/cache@v4
6666
with:
6767
path: ~/.ccache
6868
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}
6969
restore-keys: |
7070
0-ccache-${{ inputs.os }}
7171
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && inputs.os == 'ubuntu-20.04'
7272

73-
- uses: actions/cache@v3
73+
- uses: actions/cache@v4
7474
with:
7575
path: ~/.cache/ccache
7676
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}
@@ -82,7 +82,7 @@ jobs:
8282
- run: sudo apt install -y ccache ninja-build
8383
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && startsWith(inputs.os, 'ubuntu') && inputs.container_image == ''
8484

85-
- uses: actions/cache@v3
85+
- uses: actions/cache@v4
8686
with:
8787
path: ~/Library/Caches/ccache
8888
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}

‎.github/workflows/build_wamr_lldb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
PYTHON_UBUNTU_STANDALONE_BUILD: https://github.com/indygreg/python-build-standalone/releases/download/20230507/cpython-3.10.11+20230507-x86_64-unknown-linux-gnu-install_only.tar.gz
4848
PYTHON_MACOS_STANDALONE_BUILD: https://github.com/indygreg/python-build-standalone/releases/download/20230507/cpython-3.10.11+20230507-x86_64-apple-darwin-install_only.tar.gz
4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151

5252
- name: download and install wasi-sdk
5353
run: |
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Cache build
6262
id: lldb_build_cache
63-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6464
with:
6565
path: |
6666
./core/deps/llvm-project/build/bin

‎.github/workflows/build_wamr_sdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
build:
4040
runs-on: ${{ inputs.runner }}
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343

4444
- name: download wamr-app-framework
4545
run: |

‎.github/workflows/build_wamr_vscode_ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
build:
1919
runs-on: ubuntu-22.04
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

2323
- name: Use Node.js 16.x
2424
uses: actions/setup-node@v3

‎.github/workflows/build_wamrc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
build:
3636
runs-on: ${{ inputs.runner }}
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939

4040
- name: get cached LLVM libraries
4141
id: retrieve_llvm_libs
42-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4343
with:
4444
path: |
4545
./core/deps/llvm/build/bin

‎.github/workflows/coding_guidelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-20.04
2020
steps:
2121
- name: checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525

‎.github/workflows/compilation_on_android_ubuntu.yml

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ jobs:
8383
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
8484
steps:
8585
- name: checkout
86-
uses: actions/checkout@v3
86+
uses: actions/checkout@v4
8787

8888
# since jobs.id can't contain the dot character
8989
# it is hard to use `format` to assemble the cache key
9090
- name: Get LLVM libraries
9191
id: retrieve_llvm_libs
92-
uses: actions/cache@v3
92+
uses: actions/cache@v4
9393
with:
9494
path: |
9595
./core/deps/llvm/build/bin
@@ -143,6 +143,7 @@ jobs:
143143
"-DWAMR_BUILD_SIMD=1",
144144
"-DWAMR_BUILD_TAIL_CALL=1",
145145
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
146+
"-DWAMR_ENABLE_SHARED_MEMORY_MMAP=1",
146147
]
147148
os: [ubuntu-22.04]
148149
platform: [android, linux]
@@ -211,13 +212,13 @@ jobs:
211212
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
212213
steps:
213214
- name: checkout
214-
uses: actions/checkout@v3
215+
uses: actions/checkout@v4
215216

216217
# only download llvm cache when needed
217218
- name: Get LLVM libraries
218219
id: retrieve_llvm_libs
219220
if: endsWith(matrix.make_options_run_mode, '_JIT_BUILD_OPTIONS')
220-
uses: actions/cache@v3
221+
uses: actions/cache@v4
221222
with:
222223
path: |
223224
./core/deps/llvm/build/bin
@@ -282,12 +283,12 @@ jobs:
282283

283284
steps:
284285
- name: checkout
285-
uses: actions/checkout@v3
286+
uses: actions/checkout@v4
286287

287288
- name: Get LLVM libraries
288289
id: retrieve_llvm_libs
289290
if: (!endsWith(matrix.make_options, '_INTERP_BUILD_OPTIONS'))
290-
uses: actions/cache@v3
291+
uses: actions/cache@v4
291292
with:
292293
path: |
293294
./core/deps/llvm/build/bin
@@ -320,7 +321,7 @@ jobs:
320321
run: |
321322
VERBOSE=1
322323
cmake -S . -B build ${{ matrix.make_options }}
323-
cmake --build build --config Release --parallel 4
324+
cmake --build build --config Debug --parallel 4
324325
ctest --test-dir build --output-on-failure
325326
working-directory: samples/wasm-c-api
326327

@@ -348,7 +349,7 @@ jobs:
348349
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
349350
steps:
350351
- name: checkout
351-
uses: actions/checkout@v3
352+
uses: actions/checkout@v4
352353

353354
- name: download and install wasi-sdk
354355
run: |
@@ -365,7 +366,7 @@ jobs:
365366
sudo mv wabt-1.0.31 wabt
366367
- name: Get LLVM libraries
367368
id: retrieve_llvm_libs
368-
uses: actions/cache@v3
369+
uses: actions/cache@v4
369370
with:
370371
path: |
371372
./core/deps/llvm/build/bin
@@ -391,23 +392,23 @@ jobs:
391392
cd samples/file
392393
mkdir build && cd build
393394
cmake ..
394-
cmake --build . --config Release --parallel 4
395+
cmake --build . --config Debug --parallel 4
395396
./src/iwasm -f wasm-app/file.wasm -d .
396397
397398
- name: Build Sample [multi-thread]
398399
run: |
399400
cd samples/multi-thread
400401
mkdir build && cd build
401402
cmake ..
402-
cmake --build . --config Release --parallel 4
403+
cmake --build . --config Debug --parallel 4
403404
./iwasm wasm-apps/test.wasm
404405
405406
- name: Build Sample [multi-module]
406407
run: |
407408
cd samples/multi-module
408409
mkdir build && cd build
409410
cmake .. -DWAMR_BUILD_AOT=1
410-
cmake --build . --config Release --parallel 4
411+
cmake --build . --config Debug --parallel 4
411412
./multi_module mC.wasm
412413
./multi_module mC.aot
413414
@@ -416,23 +417,23 @@ jobs:
416417
cd samples/spawn-thread
417418
mkdir build && cd build
418419
cmake ..
419-
cmake --build . --config Release --parallel 4
420+
cmake --build . --config Debug --parallel 4
420421
./spawn_thread
421422
422423
- name: Build Sample [ref-types]
423424
run: |
424425
cd samples/ref-types
425426
mkdir build && cd build
426427
cmake ..
427-
cmake --build . --config Release --parallel 4
428+
cmake --build . --config Debug --parallel 4
428429
./hello
429430
430431
- name: Build Sample [wasi-threads]
431432
run: |
432433
cd samples/wasi-threads
433434
mkdir build && cd build
434435
cmake ..
435-
cmake --build . --config Release --parallel 4
436+
cmake --build . --config Debug --parallel 4
436437
./iwasm wasm-apps/no_pthread.wasm
437438
438439
- name: Build Sample [shared-module]
@@ -441,6 +442,12 @@ jobs:
441442
./build.sh
442443
./run.sh
443444
445+
- name: Build Sample [terminate]
446+
run: |
447+
cd samples/terminate
448+
./build.sh
449+
./run.sh
450+
444451
test:
445452
needs:
446453
[
@@ -504,7 +511,7 @@ jobs:
504511
test_option: $SIMD_TEST_OPTIONS
505512
steps:
506513
- name: checkout
507-
uses: actions/checkout@v3
514+
uses: actions/checkout@v4
508515

509516
- name: download and install wasi-sdk
510517
if: matrix.test_option == '$WASI_TEST_OPTIONS'
@@ -539,7 +546,7 @@ jobs:
539546
- name: Get LLVM libraries
540547
if: env.USE_LLVM == 'true'
541548
id: retrieve_llvm_libs
542-
uses: actions/cache@v3
549+
uses: actions/cache@v4
543550
with:
544551
path: |
545552
./core/deps/llvm/build/bin
@@ -601,7 +608,7 @@ jobs:
601608

602609
steps:
603610
- name: checkout
604-
uses: actions/checkout@v3
611+
uses: actions/checkout@v4
605612

606613
- name: install dependencies
607614
run: |
@@ -620,7 +627,7 @@ jobs:
620627

621628
- name: Cache LLDB
622629
id: cache-lldb
623-
uses: actions/cache@v3
630+
uses: actions/cache@v4
624631
env:
625632
cache-name: cache-lldb-vscode
626633
with:

0 commit comments

Comments
 (0)