Skip to content

Commit d9c4692

Browse files
committed
update github actions
1 parent 082ec55 commit d9c4692

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,27 @@ jobs:
5858

5959
- name: Build libc
6060
shell: bash
61-
run: make -j4
61+
run: |
62+
cmake -DCMAKE_INSTALL_PREFIX=install-sysroot .
63+
cmake --build . --target install
64+
ctest
6265
6366
- uses: actions/upload-artifact@v1
6467
with:
6568
# Upload the sysroot folder. Give it a name according to the OS it was built for.
6669
name: ${{ format( 'sysroot-{0}.tgz', matrix.os) }}
67-
path: sysroot
70+
path: install-sysroot
6871

6972
- name: Build libc + threads
7073
# Only build the thread-capable wasi-libc in the latest supported Clang
7174
# version; the earliest version does not have all necessary builtins
7275
# (e.g., `__builtin_wasm_memory_atomic_notify`).
7376
if: matrix.clang_version != '10.0.0'
7477
shell: bash
75-
run: make -j4 THREAD_MODEL=posix
78+
run: |
79+
cmake -DCMAKE_INSTALL_PREFIX=install-sysroot -DTHREAD_MODEL=posix .
80+
cmake --build . --target install
81+
ctest
7682
7783
# Disable the headerstest job for now, while WASI transitions from the
7884
# witx snapshots to wit proposals, and we have a few manual edits to the

tools/gen-imports.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ def main(argv) -> None:
6565
args, unparsed = parser.parse_known_args()
6666

6767
args.nm = os.path.normpath(args.nm)
68+
print('path:', args.libc_imports_output)
69+
print('normalized path:', os.path.normpath(args.libc_imports_output))
6870
args.libc_imports_output = os.path.normpath(args.libc_imports_output)
6971
args.defined_symbols_output = os.path.normpath(args.defined_symbols_output)
7072
args.undefined_symbols_output = os.path.normpath(

0 commit comments

Comments
 (0)