From c784aca7ab170f79afc143bc053e1a9e7c096e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 21 Jul 2022 21:01:31 +0200 Subject: [PATCH] bootstrap wasi with `./mach artifact toolchain` --- assets/linux.Dockerfile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile index 69cd3bc..657fd78 100644 --- a/assets/linux.Dockerfile +++ b/assets/linux.Dockerfile @@ -17,20 +17,13 @@ ENV TZ=Europe/Amsterdam RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget dpkg-sig ; true) RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget rpm-build rpm-sign ; true) -# setup wasi -RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\ - wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$wasi_mainversion/wasi-sdk-$wasi_fullversion-linux.tar.gz &&\ - tar xf wasi-sdk-$wasi_fullversion-linux.tar.gz &&\ - mkdir -p $target_wasi_location &&\ - rm -rf $target_wasi_location/wasi-sysroot &&\ - cp -r wasi-sdk-$wasi_fullversion/share/wasi-sysroot $target_wasi_location &&\ - rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* - # run the bootstrap -RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\ +RUN cd /tmp &&\ + wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\ tar xf librewolf-$version-$source_release.source.tar.gz &&\ cd librewolf-$version-$source_release &&\ MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\ + (cd /root/.mozbuild && /tmp/librewolf-$version-$source_release/mach artifact toolchain --from-build sysroot-wasm32-wasi) &&\ /root/.cargo/bin/cargo install cbindgen &&\ cd .. &&\ rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz