librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

changes

Browse source
This commit is contained in:
Bert van der Weerd 2022-02-04 23:44:06 +01:00
parent 5ea894e809
commit 2cd80ee2f2
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -35,7 +35,7 @@ clean :
veryclean : clean veryclean : clean
rm -f $(tarball) rm -f $(tarball)
rm -f librewolf-*-*.en-US.*-x86_64.tar.bz2 rm -f librewolf-*-*.en-US.*-x86_64.tar.bz2 librewolf-*-*.en-US.*-x86_64.tar.bz2.sha256sum
prune : prune :
docker system prune --all --force docker system prune --all --force
@ -52,48 +52,39 @@ build : debian11 mint20 ubuntu20 ubuntu21 fedora34 fedora35
push : push :
docker push librewolf/bsys5-image-debian11 librewolf/bsys5-image-mint20 librewolf/bsys5-image-ubuntu20 librewolf/bsys5-image-ubuntu21 librewolf/bsys5-image-fedora34 librewolf/bsys5-image-fedora35 docker push librewolf/bsys5-image-debian11 librewolf/bsys5-image-mint20 librewolf/bsys5-image-ubuntu20 librewolf/bsys5-image-ubuntu21 librewolf/bsys5-image-fedora34 librewolf/bsys5-image-fedora35
work : $(tarball) work : $(tarball)
mkdir work mkdir work
(cd work && tar xf ../$(tarball)) (cd work && tar xf ../$(tarball))
## debian11 ## debian11
docker-debian11 : docker-debian11 :
${MAKE} -f linux.mk distro=debian11 "distro_image=debian:bullseye" docker ${MAKE} -f linux.mk distro=debian11 "distro_image=debian:bullseye" docker
debian11 : work debian11 : work
${MAKE} -f linux.mk distro=debian11 build ${MAKE} -f linux.mk distro=debian11 build
## mint20 ## mint20
docker-mint20 : docker-mint20 :
${MAKE} -f linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker ${MAKE} -f linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
mint20 : work mint20 : work
${MAKE} -f linux.mk distro=mint20 build ${MAKE} -f linux.mk distro=mint20 build
## ubuntu20 ## ubuntu20
docker-ubuntu20 : docker-ubuntu20 :
${MAKE} -f linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker ${MAKE} -f linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
ubuntu20 : work ubuntu20 : work
${MAKE} -f linux.mk distro=ubuntu20 build ${MAKE} -f linux.mk distro=ubuntu20 build
## ubuntu21 ## ubuntu21
docker-ubuntu21 : docker-ubuntu21 :
${MAKE} -f linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker ${MAKE} -f linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
ubuntu21 : work ubuntu21 : work
${MAKE} -f linux.mk distro=ubuntu21 build ${MAKE} -f linux.mk distro=ubuntu21 build
## fedora34 ## fedora34
docker-fedora34 : docker-fedora34 :
${MAKE} -f linux.mk distro=fedora34 "distro_image=fedora:34" docker ${MAKE} -f linux.mk distro=fedora34 "distro_image=fedora:34" docker
fedora34 : work fedora34 : work
${MAKE} -f linux.mk distro=fedora34 build ${MAKE} -f linux.mk distro=fedora34 build
## fedora35 ## fedora35
docker-fedora35 : docker-fedora35 :
${MAKE} -f linux.mk distro=fedora35 "distro_image=fedora:35" docker ${MAKE} -f linux.mk distro=fedora35 "distro_image=fedora:35" docker
fedora35 : work fedora35 : work
${MAKE} -f linux.mk distro=fedora35 build ${MAKE} -f linux.mk distro=fedora35 build

4
linux.Dockerfile
View file

@ -1,3 +1,5 @@
ARG version
ARG source_release
ARG distro ARG distro
FROM $distro FROM $distro
@ -11,7 +13,7 @@ WORKDIR /bootstrap
# setup wasi # 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 ( 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 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" && 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 ) 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 )
# our work happens here, on the host filesystem. # our work happens here, on the host filesystem.
WORKDIR /work WORKDIR /work

4
linux.mk
View file

@ -2,7 +2,7 @@
# $(distro_image) # $(distro_image)
# $(use_docker) # $(use_docker)
.PHONY : docker build ci .PHONY : docker build
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
@ -13,7 +13,7 @@ use_docker=true
outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
docker : docker :
docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
build : work build : work
if [ $(use_docker) = true ]; then \ if [ $(use_docker) = true ]; then \