This commit is contained in:
Bert van der Weerd 2022-02-06 12:00:03 +01:00
parent e448cc331a
commit 9bd3182a32
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
3 changed files with 6 additions and 6 deletions

View file

@ -2,7 +2,7 @@ ARG distro
FROM $distro FROM $distro
ENV version 96.0.3 ENV version 96.0.3
ENV source_release 3 ENV source_release 5
# we use this wasi version # we use this wasi version
ENV wasi_fullversion 14.0 ENV wasi_fullversion 14.0
@ -20,7 +20,7 @@ RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; tr
# setup wasi # 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 ( 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 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 && tar xf librewolf-$version-$source_release.source.tar.gz && cd librewolf-$version && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-$version librewolf-$version-$source_release.source.tar.gz ) 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 && 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 && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz )
# our work happens here, on the host filesystem. # our work happens here, on the host filesystem.
WORKDIR /work WORKDIR /work

View file

@ -17,10 +17,10 @@ docker :
build : work build : work
if [ $(use_docker) = true ]; then \ if [ $(use_docker) = true ]; then \
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" ; \ docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \
else \ else \
(cd /work/librewolf-$(version) && ./mach build && ./mach package) ; \ (cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \
fi fi
cp -v work/librewolf-$(version)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
sha256sum $(outfile) > $(outfile).sha256sum sha256sum $(outfile) > $(outfile).sha256sum
cat $(outfile).sha256sum cat $(outfile).sha256sum

View file

@ -1 +1 @@
4 5