Skip to content

Commit c714189

Browse files
committed
Merge branch main into dev/wasi_threads
2 parents 5f0f8fe + cadf9d0 commit c714189

File tree

52 files changed

+1146
-336
lines changed

Some content is hidden

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

52 files changed

+1146
-336
lines changed

.github/workflows/build_wamr_vscode_ext.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ jobs:
3232
working-directory: test-tools/wamr-ide/VSCode-Extension
3333

3434
- name: generate wamr ide vscode extension
35+
env:
36+
credentials: ${{ secrets.TOKEN }}
3537
run: |
3638
npm install -g vsce
3739
rm -rf node_modules
3840
npm install
3941
vsce package
42+
vsce publish -p ${{ secrets.TOKEN }}
4043
working-directory: test-tools/wamr-ide/VSCode-Extension
4144

4245
- name: compress the vscode extension

.github/workflows/compilation_on_android_ubuntu.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ env:
6161
SIMD_TEST_OPTIONS: "-s spec -b -S -P"
6262
THREADS_TEST_OPTIONS: "-s spec -b -p -P"
6363
X86_32_TARGET_TEST_OPTIONS: "-m x86_32 -P"
64+
WASI_TEST_OPTIONS: "-s wasi_certification"
6465

6566
jobs:
6667
build_llvm_libraries:
@@ -395,7 +396,7 @@ jobs:
395396
cmake --build . --config Release --parallel 4
396397
./iwasm wasm-apps/no_pthread.wasm
397398
398-
spec_test:
399+
test:
399400
needs: [build_iwasm, build_llvm_libraries, build_wamrc]
400401
runs-on: ubuntu-20.04
401402
strategy:
@@ -408,6 +409,7 @@ jobs:
408409
$MULTI_MODULES_TEST_OPTIONS,
409410
$SIMD_TEST_OPTIONS,
410411
$THREADS_TEST_OPTIONS,
412+
$WASI_TEST_OPTIONS,
411413
]
412414
exclude:
413415
# uncompatiable modes and features
@@ -419,6 +421,9 @@ jobs:
419421
# aot and jit don't support multi module
420422
- running_mode: "aot"
421423
test_option: $MULTI_MODULES_TEST_OPTIONS
424+
# aot is WAMR-specific while wasi-testsuite is generic
425+
- running_mode: "aot"
426+
test_option: $WASI_TEST_OPTIONS
422427
- running_mode: "jit"
423428
test_option: $MULTI_MODULES_TEST_OPTIONS
424429
# fast-jit is only tested on default mode, exclude other three
@@ -438,7 +443,8 @@ jobs:
438443

439444
- name: set env variable(if x86_32 test needed)
440445
if: >
441-
(matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS')
446+
(matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS'
447+
|| matrix.test_option == '$WASI_TEST_OPTIONS')
442448
&& matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit'
443449
run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV
444450

@@ -460,7 +466,7 @@ jobs:
460466
if: env.USE_LLVM == 'true' && steps.cache_llvm.outputs.cache-hit != 'true'
461467
run: echo "::error::can not get prebuilt llvm libraries" && exit 1
462468

463-
- name: run spec tests default and extra
469+
- name: run tests
464470
run: ./test_wamr.sh ${{ matrix.test_option }} -t ${{ matrix.running_mode }}
465471
working-directory: ./tests/wamr-test-suites
466472

@@ -475,7 +481,7 @@ jobs:
475481
sudo apt-get update &&
476482
sudo apt install -y g++-multilib lib32gcc-9-dev
477483

478-
- name: run spec tests x86_32
484+
- name: run tests x86_32
479485
if: env.TEST_ON_X86_32 == 'true'
480486
run: ./test_wamr.sh ${{ env.X86_32_TARGET_TEST_OPTIONS }} ${{ matrix.test_option }} -t ${{ matrix.running_mode }}
481487
working-directory: ./tests/wamr-test-suites

.github/workflows/release_process.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ jobs:
150150
release_wamr_ide_vscode_ext:
151151
needs: [create_tag, create_release]
152152
uses: ./.github/workflows/build_wamr_vscode_ext.yml
153+
secrets: inherit
153154
with:
154155
upload_url: ${{ needs.create_release.outputs.upload_url }}
155156
ver_num: ${{ needs.create_tag.outputs.new_ver }}

0 commit comments

Comments
 (0)