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

started with deb+rpm stuff, other changes

Browse source
This commit is contained in:
Bert van der Weerd 2022-02-08 10:17:22 +01:00
parent ea53721a6a
commit 4b01e8fbe0
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
6 changed files with 60 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Makefile
View file

@ -65,8 +65,36 @@ build :
${MAKE} clean ${MAKE} clean
${MAKE} macos-x86_64 ${MAKE} macos-x86_64
${MAKE} clean ${MAKE} clean
${MAKE} fedora35
${MAKE} macos-aarch64 ${MAKE} macos-aarch64
${MAKE} clean
full-build :
${MAKE} docker-debian11
${MAKE} clean
${MAKE} debian11
${MAKE} docker-mint20
${MAKE} clean
${MAKE} mint20
${MAKE} docker-ubuntu20
${MAKE} clean
${MAKE} ubuntu20
${MAKE} docker-ubuntu21
${MAKE} clean
${MAKE} ubuntu21
${MAKE} docker-fedora34
${MAKE} clean
${MAKE} fedora34
${MAKE} docker-fedora35
${MAKE} clean
${MAKE} fedora35
${MAKE} docker-macos-x86_64
${MAKE} clean
${MAKE} macos-x86_64
${MAKE} docker-macos-aarch64
${MAKE} clean
${MAKE} macos-aarch64
${MAKE} clean
push : push :
docker push librewolf/bsys5-image-debian11 docker push librewolf/bsys5-image-debian11
@ -98,31 +126,37 @@ docker-debian11 :
${MAKE} -f assets/linux.mk distro=debian11 "distro_image=debian:bullseye" docker ${MAKE} -f assets/linux.mk distro=debian11 "distro_image=debian:bullseye" docker
debian11 : work debian11 : work
${MAKE} -f assets/linux.mk distro=debian11 build ${MAKE} -f assets/linux.mk distro=debian11 build
${MAKE} -f assets/linux.artifacts.mk distro=debian11 artifacts-deb
## mint20 ## mint20
docker-mint20 : docker-mint20 :
${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker ${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
mint20 : work mint20 : work
${MAKE} -f assets/linux.mk distro=mint20 build ${MAKE} -f assets/linux.mk distro=mint20 build
${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb
## ubuntu20 ## ubuntu20
docker-ubuntu20 : docker-ubuntu20 :
${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker ${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
ubuntu20 : work ubuntu20 : work
${MAKE} -f assets/linux.mk distro=ubuntu20 build ${MAKE} -f assets/linux.mk distro=ubuntu20 build
${MAKE} -f assets/linux.artifacts.mk distro=ubuntu20 artifacts-deb
## ubuntu21 ## ubuntu21
docker-ubuntu21 : docker-ubuntu21 :
${MAKE} -f assets/linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker ${MAKE} -f assets/linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
ubuntu21 : work ubuntu21 : work
${MAKE} -f assets/linux.mk distro=ubuntu21 build ${MAKE} -f assets/linux.mk distro=ubuntu21 build
${MAKE} -f assets/linux.artifacts.mk distro=ubuntu21 artifacts-deb
## fedora34 ## fedora34
docker-fedora34 : docker-fedora34 :
${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker ${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker
fedora34 : work fedora34 : work
${MAKE} -f assets/linux.mk distro=fedora34 build ${MAKE} -f assets/linux.mk distro=fedora34 build
${MAKE} -f assets/linux.artifacts.mk distro=fedora34 artifacts-rpm
## fedora35 ## fedora35
docker-fedora35 : docker-fedora35 :
${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker ${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker
fedora35 : work fedora35 : work
${MAKE} -f assets/linux.mk distro=fedora35 build ${MAKE} -f assets/linux.mk distro=fedora35 build
${MAKE} -f assets/linux.artifacts.mk distro=fedora35 artifacts-rpm
# #

7
assets/linux.Dockerfile
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 5 ENV source_release 6
# we use this wasi version # we use this wasi version
ENV wasi_fullversion 14.0 ENV wasi_fullversion 14.0
@ -15,7 +15,7 @@ ENV TZ=Europe/Amsterdam
# dependencies needed to run ./mach bootstrap # dependencies needed to run ./mach bootstrap
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true) RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true)
RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; true) RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget rpm-build ; true)
# setup wasi # setup wasi
RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\ RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\
@ -31,8 +31,7 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c
tar xf librewolf-$version-$source_release.source.tar.gz &&\ tar xf librewolf-$version-$source_release.source.tar.gz &&\
cd librewolf-$version-$source_release &&\ cd librewolf-$version-$source_release &&\
MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\ MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
. /root/.cargo/env &&\ /root/.cargo/bin/cargo install cbindgen &&\
cargo install cbindgen &&\
cd .. &&\ cd .. &&\
rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz

18
assets/linux.artifacts.mk Normal file
View file

@ -0,0 +1,18 @@
# $(distro)
# $(use_docker)
.PHONY : artifacts-deb artifacts-rpm
version:=$(shell cat version)
release:=$(shell cat release)
source_release:=$(shell cat source_release)
use_docker=true
infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
artifacts-deb : $(infile) $(infile).sha256sum
sha256sum -c $(infile).sha256sum
artifacts-rpm : $(infile) $(infile).sha256sum
sha256sum -c $(infile).sha256sum

3
assets/linux.mk
View file

@ -15,8 +15,9 @@ 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) - < assets/linux.Dockerfile docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
build : build : $(outfile) $(outfile).sha256sum
$(outfile) $(outfile).sha256sum :
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)-$(source_release) && ./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 \

2
assets/macos.Dockerfile
View file

@ -6,7 +6,7 @@ ARG arch=error
# version of librewolf we use to bootstrap (does not need to be recent) # version of librewolf we use to bootstrap (does not need to be recent)
ENV version 96.0.3 ENV version 96.0.3
ENV source_release 5 ENV source_release 6
# we use this wasi version # we use this wasi version
ENV wasi_fullversion 14.0 ENV wasi_fullversion 14.0

2
source_release
View file

@ -1 +1 @@
5 6