summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrew Clayton <a.clayton@nginx.com>2023-08-23 20:32:33 +0100
committerAndrew Clayton <a.clayton@nginx.com>2023-08-23 21:29:25 +0100
commit9c0782ddaec7d83539d86eb8a283c7cb8135acf4 (patch)
tree070160ffc29cc9cf9a88034da5235fcc4fcb7673
parentec49ea8e1737e38b2ab704475a87d0580245dc4e (diff)
downloadunit-wasm-9c0782ddaec7d83539d86eb8a283c7cb8135acf4.tar.gz
unit-wasm-9c0782ddaec7d83539d86eb8a283c7cb8135acf4.tar.bz2
github/workflows: No need to download the wasi-sysroot
The wasi-sysroot is now packaged by Fedora in the wasi-libc-devel & wasi-libc-static packages (just installing wasi-libc-devel should bring in the other if needed). We also no longer need bindgen-cli as we are building the rust stuff from within the build.rs files. Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
-rw-r--r--.github/workflows/build_tests.yaml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/build_tests.yaml b/.github/workflows/build_tests.yaml
index 0e16867..9dc463d 100644
--- a/.github/workflows/build_tests.yaml
+++ b/.github/workflows/build_tests.yaml
@@ -31,13 +31,12 @@ jobs:
steps:
- name: Install tools/deps
run: |
- dnf -y install git wget clang llvm compiler-rt lld make bindgen-cli cargo rust rust-std-static-wasm32-unknown-unknown rust-std-static-wasm32-wasi
+ dnf -y install git wget clang llvm compiler-rt lld make wasi-libc-devel cargo rust rust-std-static-wasm32-unknown-unknown rust-std-static-wasm32-wasi
wget -O- https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz | tar --strip-components=1 -xvzf - -C $(dirname $(rpm -ql compiler-rt | grep lib/libclang_rt.builtins-x86_64.a))
- wget -O- https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz | tar -xvzf - -C ${RUNNER_TEMP}
- uses: actions/checkout@v3
with:
fetch-depth: "0"
- name: make
- run: make WASI_SYSROOT=${RUNNER_TEMP}/wasi-sysroot V=1 E=1 all
+ run: make V=1 E=1 all