From 3d1264f747b2dcb49831dea3c2109ef6d60e699a Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 4 Feb 2022 14:05:26 +0100 Subject: [PATCH] changes --- Dockerfile | 5 +---- Makefile | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3be05fd..579f08d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,7 @@ WORKDIR /bootstrap # setup wasi RUN ( export target_wasi_location=$HOME/.mozbuild/wrlb/ && wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz && tar xf wasi-sdk-14.0-linux.tar.gz && mkdir -p $target_wasi_location && rm -rf $target_wasi_location/wasi-sysroot && cp -vr wasi-sdk-14.0/share/wasi-sysroot $target_wasi_location && rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* ) # run the bootstrap -RUN wget -q -O librewolf-96.0.3-3.source.tar.gz "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-3.source.tar.gz?job=Build" -RUN tar xf librewolf-96.0.3-3.source.tar.gz -WORKDIR librewolf-96.0.3 -RUN (MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen) +RUN ( wget -q -O librewolf-96.0.3-3.source.tar.gz "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-3.source.tar.gz?job=Build" && tar xf librewolf-96.0.3-3.source.tar.gz && cd librewolf-96.0.3 && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-96.0.3 ) # our work happens here, on the host filesystem. WORKDIR /work diff --git a/Makefile b/Makefile index 7697535..17bb089 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,7 @@ run-docker-image-debian11 : mkdir work (cd work && tar xf ../$(tarball)) docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-debian11 sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" + cp -v work/librewolf-96.0.3/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.debian11-x86_64.tar.bz2 @@ -58,7 +59,8 @@ run-docker-image-fedora35 : sudo rm -rf work mkdir work (cd work && tar xf ../$(tarball)) - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-fedora35 sh -c "cd /work/librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-fedora35 sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" + cp -v work/librewolf-96.0.3/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.fedora35-x86_64.tar.bz2