Skip to content

Commit 382d93f

Browse files
committed
Merge branch main into dev/aot_stack_frame
2 parents 8decbbb + 2eb6006 commit 382d93f

File tree

128 files changed

+4310
-1409
lines changed

Some content is hidden

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

128 files changed

+4310
-1409
lines changed

.github/workflows/build_docker_images.yml

+1-1
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

+2-2
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

+5-5
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

+2-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
build:
3636
runs-on: ${{ inputs.runner }}
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939

4040
- name: download and install wasi-sdk
4141
run: |

.github/workflows/build_wamr_vscode_ext.yml

+1-1
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

+2-2
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

+1-1
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

+26-19
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ jobs:
8585
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
8686
steps:
8787
- name: checkout
88-
uses: actions/checkout@v3
88+
uses: actions/checkout@v4
8989

9090
# since jobs.id can't contain the dot character
9191
# it is hard to use `format` to assemble the cache key
9292
- name: Get LLVM libraries
9393
id: retrieve_llvm_libs
94-
uses: actions/cache@v3
94+
uses: actions/cache@v4
9595
with:
9696
path: |
9797
./core/deps/llvm/build/bin
@@ -145,6 +145,7 @@ jobs:
145145
"-DWAMR_BUILD_SIMD=1",
146146
"-DWAMR_BUILD_TAIL_CALL=1",
147147
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
148+
"-DWAMR_ENABLE_SHARED_MEMORY_MMAP=1",
148149
]
149150
os: [ubuntu-22.04]
150151
platform: [android, linux]
@@ -213,13 +214,13 @@ jobs:
213214
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
214215
steps:
215216
- name: checkout
216-
uses: actions/checkout@v3
217+
uses: actions/checkout@v4
217218

218219
# only download llvm cache when needed
219220
- name: Get LLVM libraries
220221
id: retrieve_llvm_libs
221222
if: endsWith(matrix.make_options_run_mode, '_JIT_BUILD_OPTIONS')
222-
uses: actions/cache@v3
223+
uses: actions/cache@v4
223224
with:
224225
path: |
225226
./core/deps/llvm/build/bin
@@ -284,12 +285,12 @@ jobs:
284285

285286
steps:
286287
- name: checkout
287-
uses: actions/checkout@v3
288+
uses: actions/checkout@v4
288289

289290
- name: Get LLVM libraries
290291
id: retrieve_llvm_libs
291292
if: (!endsWith(matrix.make_options, '_INTERP_BUILD_OPTIONS'))
292-
uses: actions/cache@v3
293+
uses: actions/cache@v4
293294
with:
294295
path: |
295296
./core/deps/llvm/build/bin
@@ -322,7 +323,7 @@ jobs:
322323
run: |
323324
VERBOSE=1
324325
cmake -S . -B build ${{ matrix.make_options }}
325-
cmake --build build --config Release --parallel 4
326+
cmake --build build --config Debug --parallel 4
326327
ctest --test-dir build --output-on-failure
327328
working-directory: samples/wasm-c-api
328329

@@ -350,7 +351,7 @@ jobs:
350351
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
351352
steps:
352353
- name: checkout
353-
uses: actions/checkout@v3
354+
uses: actions/checkout@v4
354355

355356
- name: download and install wasi-sdk
356357
run: |
@@ -367,7 +368,7 @@ jobs:
367368
sudo mv wabt-1.0.31 wabt
368369
- name: Get LLVM libraries
369370
id: retrieve_llvm_libs
370-
uses: actions/cache@v3
371+
uses: actions/cache@v4
371372
with:
372373
path: |
373374
./core/deps/llvm/build/bin
@@ -393,23 +394,23 @@ jobs:
393394
cd samples/file
394395
mkdir build && cd build
395396
cmake ..
396-
cmake --build . --config Release --parallel 4
397+
cmake --build . --config Debug --parallel 4
397398
./src/iwasm -f wasm-app/file.wasm -d .
398399
399400
- name: Build Sample [multi-thread]
400401
run: |
401402
cd samples/multi-thread
402403
mkdir build && cd build
403404
cmake ..
404-
cmake --build . --config Release --parallel 4
405+
cmake --build . --config Debug --parallel 4
405406
./iwasm wasm-apps/test.wasm
406407
407408
- name: Build Sample [multi-module]
408409
run: |
409410
cd samples/multi-module
410411
mkdir build && cd build
411412
cmake .. -DWAMR_BUILD_AOT=1
412-
cmake --build . --config Release --parallel 4
413+
cmake --build . --config Debug --parallel 4
413414
./multi_module mC.wasm
414415
./multi_module mC.aot
415416
@@ -418,15 +419,15 @@ jobs:
418419
cd samples/spawn-thread
419420
mkdir build && cd build
420421
cmake ..
421-
cmake --build . --config Release --parallel 4
422+
cmake --build . --config Debug --parallel 4
422423
./spawn_thread
423424
424425
- name: Build Sample [ref-types]
425426
run: |
426427
cd samples/ref-types
427428
mkdir build && cd build
428429
cmake ..
429-
cmake --build . --config Release --parallel 4
430+
cmake --build . --config Debug --parallel 4
430431
./hello
431432
432433
- name: Build Sample [simple]
@@ -441,7 +442,7 @@ jobs:
441442
cd samples/wasi-threads
442443
mkdir build && cd build
443444
cmake ..
444-
cmake --build . --config Release --parallel 4
445+
cmake --build . --config Debug --parallel 4
445446
./iwasm wasm-apps/no_pthread.wasm
446447
447448
- name: Build Sample [shared-module]
@@ -450,6 +451,12 @@ jobs:
450451
./build.sh
451452
./run.sh
452453
454+
- name: Build Sample [terminate]
455+
run: |
456+
cd samples/terminate
457+
./build.sh
458+
./run.sh
459+
453460
test:
454461
needs:
455462
[
@@ -513,7 +520,7 @@ jobs:
513520
test_option: $SIMD_TEST_OPTIONS
514521
steps:
515522
- name: checkout
516-
uses: actions/checkout@v3
523+
uses: actions/checkout@v4
517524

518525
- name: download and install wasi-sdk
519526
if: matrix.test_option == '$WASI_TEST_OPTIONS'
@@ -548,7 +555,7 @@ jobs:
548555
- name: Get LLVM libraries
549556
if: env.USE_LLVM == 'true'
550557
id: retrieve_llvm_libs
551-
uses: actions/cache@v3
558+
uses: actions/cache@v4
552559
with:
553560
path: |
554561
./core/deps/llvm/build/bin
@@ -610,7 +617,7 @@ jobs:
610617

611618
steps:
612619
- name: checkout
613-
uses: actions/checkout@v3
620+
uses: actions/checkout@v4
614621

615622
- name: install dependencies
616623
run: |
@@ -629,7 +636,7 @@ jobs:
629636

630637
- name: Cache LLDB
631638
id: cache-lldb
632-
uses: actions/cache@v3
639+
uses: actions/cache@v4
633640
env:
634641
cache-name: cache-lldb-vscode
635642
with:

0 commit comments

Comments
 (0)