xavi
/
bsys5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use_docker variable

This commit is contained in:
Bert van der Weerd 2022-02-04 22:54:32 +01:00
parent 2ab7842a4f 3e938ae363
commit e6c58b431d
No known key found for this signature in database
GPG Key ID: 4CFABB96ADE0F5B1
3 changed files with 24 additions and 40 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
/typescript
/work

48
Makefile
View File

@ -1,9 +1,11 @@
.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)
release:=$(shell cat release)
source_release:=$(shell cat source_release)
use_docker=true
tarball=librewolf-$(version)-$(source_release).source.tar.gz
help :
@ -26,14 +28,6 @@ help :
@echo " [fedora34]"
@echo " [fedora35]"
@echo ""
@echo "CI targets:"
@echo " [ci-debian11]"
@echo " [ci-mint20]"
@echo " [ci-ubuntu20]"
@echo " [ci-ubuntu21]"
@echo " [ci-fedora34]"
@echo " [ci-fedora35]"
@echo ""
all :
@ -68,52 +62,40 @@ work : $(tarball)
## debian11
docker-debian11 :
${MAKE} -f linux.mk distro=debian11 "distro_image=debian:bullseye" docker
${MAKE} -f linux.mk use_docker=$(use_docker) distro=debian11 "distro_image=debian:bullseye" docker
debian11 : work
${MAKE} -f linux.mk distro=debian11 build
ci-debian11 : work
${MAKE} -f linux.mk distro=debian11 ci
${MAKE} -f linux.mk use_docker=$(use_docker) distro=debian11 build
## mint20
docker-mint20 :
${MAKE} -f linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
${MAKE} -f linux.mk use_docker=$(use_docker) distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
mint20 : work
${MAKE} -f linux.mk distro=mint20 build
ci-mint20 : work
${MAKE} -f linux.mk distro=mint20 ci
${MAKE} -f linux.mk use_docker=$(use_docker) distro=mint20 build
## ubuntu20
docker-ubuntu20 :
${MAKE} -f linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
${MAKE} -f linux.mk use_docker=$(use_docker) distro=ubuntu20 "distro_image=ubuntu:20.04" docker
ubuntu20 : work
${MAKE} -f linux.mk distro=ubuntu20 build
ci-ubuntu20 : work
${MAKE} -f linux.mk distro=ubuntu20 ci
${MAKE} -f linux.mk use_docker=$(use_docker) distro=ubuntu20 build
## ubuntu21
docker-ubuntu21 :
${MAKE} -f linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
${MAKE} -f linux.mk use_docker=$(use_docker) distro=ubuntu21 "distro_image=ubuntu:21.10" docker
ubuntu21 : work
${MAKE} -f linux.mk distro=ubuntu21 build
ci-ubuntu21 : work
${MAKE} -f linux.mk distro=ubuntu21 ci
${MAKE} -f linux.mk use_docker=$(use_docker) distro=ubuntu21 build
## fedora34
docker-fedora34 :
${MAKE} -f linux.mk distro=fedora34 "distro_image=fedora:34" docker
${MAKE} -f linux.mk use_docker=$(use_docker) distro=fedora34 "distro_image=fedora:34" docker
fedora34 : work
${MAKE} -f linux.mk distro=fedora34 build
ci-fedora34 : work
${MAKE} -f linux.mk distro=fedora34 ci
${MAKE} -f linux.mk use_docker=$(use_docker) distro=fedora34 build
## fedora35
docker-fedora35 :
${MAKE} -f linux.mk distro=fedora35 "distro_image=fedora:35" docker
${MAKE} -f linux.mk use_docker=$(use_docker) distro=fedora35 "distro_image=fedora:35" docker
fedora35 : work
${MAKE} -f linux.mk distro=fedora35 build
ci-fedora35 : work
${MAKE} -f linux.mk distro=fedora35 ci
${MAKE} -f linux.mk use_docker=$(use_docker) distro=fedora35 build

15
linux.mk
View File

@ -1,11 +1,13 @@
# $(distro)
# $(distro_image)
# $(use_docker)
.PHONY : docker build ci
version:=$(shell cat version)
release:=$(shell cat release)
source_release:=$(shell cat source_release)
use_docker:=true
outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
@ -13,11 +15,10 @@ docker :
docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < Dockerfile
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"
cp -v work/librewolf-$(version)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile)
sha256sum $(outfile)
ci : work
(cd /work/librewolf-$(version) && ./mach build && ./mach package)
cp -v work/librewolf-$(version)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile)
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" ; \
else \
(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
sha256sum $(outfile)