File tree Expand file tree Collapse file tree 2 files changed +7
-19
lines changed
Expand file tree Collapse file tree 2 files changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -682,15 +682,6 @@ jobs:
682682 with :
683683 os : ${{ matrix.os }}
684684
685- # It is a temporary solution until new wasi-sdk that includes bug fixes is released
686- - name : build wasi-libc from source
687- if : matrix.test_option == '$WASI_TEST_OPTIONS'
688- run : |
689- git clone https://github.com/WebAssembly/wasi-libc
690- cd wasi-libc
691- make -j AR=/opt/wasi-sdk/bin/llvm-ar NM=/opt/wasi-sdk/bin/llvm-nm CC=/opt/wasi-sdk/bin/clang THREAD_MODEL=posix
692- echo "SYSROOT_PATH=$PWD/sysroot" >> $GITHUB_ENV
693-
694685 - name : set env variable(if llvm are used)
695686 if : matrix.running_mode == 'aot' || matrix.running_mode == 'jit' || matrix.running_mode == 'multi-tier-jit'
696687 run : echo "USE_LLVM=true" >> $GITHUB_ENV
@@ -727,7 +718,7 @@ jobs:
727718
728719 - name : Build WASI thread tests
729720 if : matrix.test_option == '$WASI_TEST_OPTIONS'
730- run : bash build.sh --sysroot "$SYSROOT_PATH"
721+ run : bash build.sh
731722 working-directory : ./core/iwasm/libraries/lib-wasi-threads/test/
732723
733724 - name : build socket api tests
Original file line number Diff line number Diff line change @@ -644,14 +644,11 @@ jobs:
644644 with :
645645 os : ${{ matrix.os }}
646646
647- # It is a temporary solution until new wasi-sdk that includes bug fixes is released
648- - name : build wasi-libc from source
647+ - name : download and install wasi-sdk
649648 if : matrix.test_option == '$WASI_TEST_OPTIONS'
650- run : |
651- git clone https://github.com/WebAssembly/wasi-libc
652- cd wasi-libc
653- make -j AR=/opt/wasi-sdk/bin/llvm-ar NM=/opt/wasi-sdk/bin/llvm-nm CC=/opt/wasi-sdk/bin/clang THREAD_MODEL=posix
654- echo "SYSROOT_PATH=$PWD/sysroot" >> $GITHUB_ENV
649+ uses : ./.github/actions/install-wasi-sdk-wabt
650+ with :
651+ os : ${{ matrix.os }}
655652
656653 - name : set env variable(if llvm are used)
657654 if : matrix.running_mode == 'aot' || matrix.running_mode == 'jit' || matrix.running_mode == 'multi-tier-jit'
@@ -697,12 +694,12 @@ jobs:
697694
698695 - name : Build WASI thread tests
699696 if : matrix.test_option == '$WASI_TEST_OPTIONS'
700- run : bash build.sh --sysroot "$SYSROOT_PATH"
697+ run : bash build.sh
701698 working-directory : ./core/iwasm/libraries/lib-wasi-threads/test/
702699
703700 - name : Build WASI thread stress tests
704701 if : matrix.test_option == '$WASI_TEST_OPTIONS'
705- run : bash build.sh --sysroot "$SYSROOT_PATH"
702+ run : bash build.sh
706703 working-directory : ./core/iwasm/libraries/lib-wasi-threads/stress-test/
707704
708705 - name : build socket api tests
You can’t perform that action at this time.
0 commit comments