diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile index a091cad..9c43ccb 100644 --- a/assets/linux.Dockerfile +++ b/assets/linux.Dockerfile @@ -2,7 +2,7 @@ ARG distro FROM $distro ENV version 96.0.3 -ENV source_release 3 +ENV source_release 5 # we use this wasi version ENV wasi_fullversion 14.0 @@ -20,7 +20,7 @@ RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; tr # 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 && 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. WORKDIR /work diff --git a/assets/linux.mk b/assets/linux.mk index 6d9cb6b..aa4c218 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -17,10 +17,10 @@ docker : build : work 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 \ - (cd /work/librewolf-$(version) && ./mach build && ./mach package) ; \ + (cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ 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 cat $(outfile).sha256sum diff --git a/source_release b/source_release index b8626c4..7ed6ff8 100644 --- a/source_release +++ b/source_release @@ -1 +1 @@ -4 +5