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

Merge branch 'improve_ci' into 'master'

Browse source 
improve how the ci works

See merge request librewolf-community/browser/bsys5!1
This commit is contained in:
Malte Jürgens 2022-02-04 21:27:50 +00:00
commit 9507866cc2
3 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/librewolf-*-*.source.tar.gz /librewolf-*-*.source.tar.gz
/typescript /typescript
/work

22
Makefile
View file

@ -1,4 +1,4 @@
.PHONY : help all clean veryclean fetch prune docker push build docker-debian11 debian11 ci-debian11 docker-mint20 mint20 ci-mint20 docker-ubuntu20 ubuntu20 ci-ubuntu20 docker-ubuntu21 ubuntu21 ci-ubuntu21 docker-fedora34 fedora34 ci-fedora34 docker-fedora35 fedora35 ci-fedora35 .PHONY : help all clean veryclean fetch prune docker push build docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
@ -26,14 +26,6 @@ help :
@echo " [fedora34]" @echo " [fedora34]"
@echo " [fedora35]" @echo " [fedora35]"
@echo "" @echo ""
@echo "CI targets:"
@echo " [ci-debian11]"
@echo " [ci-mint20]"
@echo " [ci-ubuntu20]"
@echo " [ci-ubuntu21]"
@echo " [ci-fedora34]"
@echo " [ci-fedora35]"
@echo ""
all : all :
@ -71,32 +63,24 @@ 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
ci-debian11 : work
${MAKE} -f linux.mk distro=debian11 ci
## 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
ci-mint20 : work
${MAKE} -f linux.mk distro=mint20 ci
## 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
ci-ubuntu20 : work
${MAKE} -f linux.mk distro=ubuntu20 ci
## 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
ci-ubuntu21 : work
${MAKE} -f linux.mk distro=ubuntu21 ci
@ -105,15 +89,11 @@ 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
ci-fedora34 : work
${MAKE} -f linux.mk distro=fedora34 ci
## 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
ci-fedora35 : work
${MAKE} -f linux.mk distro=fedora35 ci

11
linux.mk
View file

@ -6,14 +6,15 @@
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
use_docker:=true
docker : docker :
docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < Dockerfile docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < Dockerfile
build : work build : work
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" if [ $(use_docker) = true ]; then \
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 docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" ; \
else \
ci : work (cd /work/librewolf-$(version) && ./mach build && ./mach package) ; \
(cd /work/librewolf-$(version) && ./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)/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