diff --git a/Makefile b/Makefile index 17bb089..3652f54 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,15 @@ tarball=librewolf-$(version)-$(source_release).source.tar.gz help : @echo "Use: make [help] [all] [docker] [build] [clean] [veryclean] [fetch] [prune]" @echo "" - @echo "Os targets:" - @echo " [debian11] - docker+build for debian11" - @echo " [fedora35] - docker+build for fedora35" + @echo "OS targets:" + @echo " [debian11] - build for debian11" + @echo " [fedora35] - build for fedora35" + @echo "" + @echo "CI targets:" + @echo " [ci-debian11]" + @echo " [ci-fedora35]" + @echo "" + all : @echo "Nothing happens." @@ -29,12 +35,11 @@ fetch : $(tarball) $(tarball) : wget -O $(tarball) "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/$(tarball)?job=Build" - docker : make-docker-image-debian11 make-docker-image-fedora35 build : run-docker-image-debian11 run-docker-image-fedora35 ## debian11 -debian11 : make-docker-image-debian11 run-docker-image-debian11 +debian11 : run-docker-image-debian11 make-docker-image-debian11 : docker build --build-arg "distro=debian:bullseye" -t librewolf/bsys5-image-debian11 - < Dockerfile @@ -42,7 +47,14 @@ run-docker-image-debian11 : sudo rm -rf work mkdir work (cd work && tar xf ../$(tarball)) - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-debian11 sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-debian11 sh -c "(cd work/librewolf-$(version) && ./mach build && ./mach package)" + cp -v work/librewolf-96.0.3/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.debian11-x86_64.tar.bz2 + +ci-debian11 : + sudo rm -rf work + mkdir work + (cd work && tar xf ../$(tarball)) + (cd work/librewolf-$(version) && ./mach build && ./mach package) cp -v work/librewolf-96.0.3/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.debian11-x86_64.tar.bz2 @@ -51,7 +63,7 @@ run-docker-image-debian11 : ## fedora35 -fedora35 : make-docker-image-fedora35 run-docker-image-fedora35 +fedora35 : run-docker-image-fedora35 make-docker-image-fedora35 : docker build --build-arg "distro=fedora:35" -t librewolf/bsys5-image-fedora35 - < Dockerfile @@ -62,6 +74,13 @@ run-docker-image-fedora35 : docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-fedora35 sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package" cp -v work/librewolf-96.0.3/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.fedora35-x86_64.tar.bz2 +ci-fedora35 : + sudo rm -rf work + mkdir work + (cd work && tar xf ../$(tarball)) + (cd /work/librewolf-$(version) && ./mach build && ./mach package) + cp -v work/librewolf-96.0.3/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.fedora35-x86_64.tar.bz2 +