From 3e938ae36339fb3822b3e1d747d67ef4763852a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Fri, 4 Feb 2022 22:27:29 +0100
Subject: [PATCH] improve how the ci works

---
 .gitignore |  1 +
 Makefile   | 22 +---------------------
 linux.mk   | 11 ++++++-----
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39e8da9..99eb9bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /librewolf-*-*.source.tar.gz
 /typescript
+/work
diff --git a/Makefile b/Makefile
index 5330fc2..0f206e9 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 release:=$(shell cat release)
@@ -26,14 +26,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 :
@@ -71,32 +63,24 @@ docker-debian11 :
 	${MAKE} -f linux.mk 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
 
 ## mint20
 docker-mint20 :
 	${MAKE} -f linux.mk 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
 
 ## ubuntu20
 docker-ubuntu20 :
 	${MAKE} -f linux.mk 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
 
 ## ubuntu21
 docker-ubuntu21 :
 	${MAKE} -f linux.mk 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
 
 
 
@@ -105,15 +89,11 @@ docker-fedora34 :
 	${MAKE} -f linux.mk 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
 
 ## fedora35
 docker-fedora35 :
 	${MAKE} -f linux.mk 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
 
 
diff --git a/linux.mk b/linux.mk
index 16d9cd2..17a8d77 100644
--- a/linux.mk
+++ b/linux.mk
@@ -6,14 +6,15 @@
 version:=$(shell cat version)
 release:=$(shell cat release)
 source_release:=$(shell cat source_release)
+use_docker:=true
 
 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 librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 
-
-ci : work
-	(cd /work/librewolf-$(version) && ./mach build && ./mach package)
+	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