From 82d97de5453d8b23c5db29ddede14550cdd5c4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Tue, 19 Apr 2022 06:59:17 +0000 Subject: [PATCH 01/26] Some Improvements --- .gitignore | 2 +- assets/linux.artifacts.mk | 29 ++++++++++++----------------- assets/linux.mk | 19 ++++++++----------- assets/macos.mk | 15 +++++---------- 4 files changed, 26 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 99eb9bf..80b08fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/librewolf-*-*.source.tar.gz +/librewolf-* /typescript /work diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk index a8392c3..773935d 100644 --- a/assets/linux.artifacts.mk +++ b/assets/linux.artifacts.mk @@ -8,11 +8,6 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) -#use_docker=true -ifeq ($(use_docker),) -use_docker:=true -endif - infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 # @@ -24,11 +19,11 @@ librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb : $(infile) (cd work && tar xf ../$<) cp -v assets/linux.build-deb.sh work/ (cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop) - if [ $(use_docker) = true ]; then \ - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)" ; \ - else \ - (cd work && bash linux.build-deb.sh $(version) $(release)) ; \ - fi +ifeq ($(use_docker),false) + (cd work && bash linux.build-deb.sh $(version) $(release)) +else + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)" +endif cp -v work/librewolf.deb $@ sha256sum $@ > $@.sha256sum cat $@.sha256sum @@ -54,13 +49,13 @@ librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile) rm -f work/librewolf/pingsender rm -f work/librewolf/precomplete rm -f work/librewolf/removed-files - if [ $(use_docker) = true ]; then \ - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(version) $(release)" ; \ - cp -v work/$@ $@ ; \ - else \ - (cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ - cp -v /work/$@ $@ ; \ - fi +ifeq ($(use_docker),false) + (cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ + cp -v /work/$@ $@ +else + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(version) $(release)" ; \ + cp -v work/$@ $@ +endif sha256sum $@ > $@.sha256sum cat $@.sha256sum diff --git a/assets/linux.mk b/assets/linux.mk index 550c39b..4d8ba4c 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -8,11 +8,6 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) -#use_docker=true -ifeq ($(use_docker),) -use_docker:=true -endif - outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 docker : @@ -20,13 +15,15 @@ docker : build : $(outfile) $(outfile).sha256sum -$(outfile) $(outfile).sha256sum : +$(outfile) : ${MAKE} work - 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" ; \ - else \ - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ - fi +ifeq ($(use_docker),false) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) +else + 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" +endif cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) + +$(outfile).sha256sum : $(outfile) sha256sum $(outfile) > $(outfile).sha256sum cat $(outfile).sha256sum diff --git a/assets/macos.mk b/assets/macos.mk index ea6858e..200047a 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -7,11 +7,6 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) -#use_docker=true -ifeq ($(use_docker),) -use_docker:=true -endif - outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg docker : @@ -22,11 +17,11 @@ build : $(outfile) $(outfile).sha256sum $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig - if [ $(use_docker) = true ]; then \ - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \ - else \ - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ - fi +ifeq ($(use_docker),false) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) +else + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" +endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum cat $(outfile).sha256sum From 4579d0a8d22a1626715182ec10867d3d7ba40053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 21 Apr 2022 19:28:14 +0200 Subject: [PATCH 02/26] add ubuntu22 make target --- Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2b9caef..6ad2c83 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 +.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 version:=$(shell cat version) release:=$(shell cat release) @@ -16,6 +16,7 @@ help : @echo " [docker-mint20]" @echo " [docker-ubuntu20]" @echo " [docker-ubuntu21]" + @echo " [docker-ubuntu22]" @echo " [docker-fedora34]" @echo " [docker-fedora35]" @echo " [docker-macos-x86_64]" @@ -26,6 +27,7 @@ help : @echo " [mint20]" @echo " [ubuntu20]" @echo " [ubuntu21]" + @echo " [ubuntu22]" @echo " [fedora34]" @echo " [fedora35]" @echo " [macos-x64_64]" @@ -45,7 +47,7 @@ veryclean : clean prune : docker system prune --all --force -docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-fedora34 docker-fedora35 docker-macos-x86_64 docker-macos-aarch64 +docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-macos-x86_64 docker-macos-aarch64 build : ${MAKE} clean @@ -57,6 +59,8 @@ build : ${MAKE} clean ${MAKE} ubuntu21 ${MAKE} clean + ${MAKE} ubuntu22 + ${MAKE} clean ${MAKE} fedora34 ${MAKE} clean ${MAKE} fedora35 @@ -71,6 +75,7 @@ push : docker push librewolf/bsys5-image-mint20 docker push librewolf/bsys5-image-ubuntu20 docker push librewolf/bsys5-image-ubuntu21 + docker push librewolf/bsys5-image-ubuntu22 docker push librewolf/bsys5-image-fedora34 docker push librewolf/bsys5-image-fedora35 docker push librewolf/bsys5-image-macos-x86_64 @@ -81,6 +86,7 @@ rmi : docker rmi librewolf/bsys5-image-mint20 docker rmi librewolf/bsys5-image-ubuntu20 docker rmi librewolf/bsys5-image-ubuntu21 + docker rmi librewolf/bsys5-image-ubuntu22 docker rmi librewolf/bsys5-image-fedora34 docker rmi librewolf/bsys5-image-fedora35 docker rmi librewolf/bsys5-image-macos-x86_64 @@ -127,16 +133,22 @@ mint20 : ${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb ## 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:focal" docker ubuntu20 : ${MAKE} -f assets/linux.mk distro=ubuntu20 build ${MAKE} -f assets/linux.artifacts.mk distro=ubuntu20 artifacts-deb ## 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:impish" docker ubuntu21 : ${MAKE} -f assets/linux.mk distro=ubuntu21 build ${MAKE} -f assets/linux.artifacts.mk distro=ubuntu21 artifacts-deb +## ubuntu22 +docker-ubuntu22 : + ${MAKE} -f assets/linux.mk distro=ubuntu22 "distro_image=ubuntu:jammy" docker +ubuntu22 : + ${MAKE} -f assets/linux.mk distro=ubuntu22 build + ${MAKE} -f assets/linux.artifacts.mk distro=ubuntu22 artifacts-deb ## fedora34 docker-fedora34 : ${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker From 7f01dde28b338efaa693f516f815b10f076ac1f7 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 21 Apr 2022 19:32:17 +0200 Subject: [PATCH 03/26] build 2 of the v99.0.1-3 release --- release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release b/release index d00491f..0cfbf08 100644 --- a/release +++ b/release @@ -1 +1 @@ -1 +2 From b29f841a753aa6d53d5ad6094e35b4d381e0f302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 21 Apr 2022 19:36:06 +0200 Subject: [PATCH 04/26] add ubuntu22 to .gitlab-ci.yml --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8599616..8da6010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ Build: - debian11 - ubuntu20 - ubuntu21 + - ubuntu22 - mint20 - fedora34 - fedora35 @@ -74,6 +75,8 @@ Release: upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb.sha256sum upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb + upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb.sha256sum upload_package librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb upload_package librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb.sha256sum upload_package librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm @@ -107,6 +110,12 @@ Release: - name: Ubuntu 21 (sha256sum) link_type: other url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb.sha256sum + - name: Ubuntu 22 (deb) + link_type: package + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb + - name: Ubuntu 22 (sha256sum) + link_type: other + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb.sha256sum - name: Linux Mint 20 (deb) link_type: package url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb From bf1e84856f05237dffae89dbe14bf4b2b49283b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 28 Apr 2022 21:31:12 +0200 Subject: [PATCH 05/26] bump release nuber to 4 --- release | 2 +- source_release | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release b/release index 0cfbf08..b8626c4 100644 --- a/release +++ b/release @@ -1 +1 @@ -2 +4 diff --git a/source_release b/source_release index 00750ed..b8626c4 100644 --- a/source_release +++ b/source_release @@ -1 +1 @@ -3 +4 From f8cf1bb3b432921e23e44f0a8f3df772d6cec5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Tue, 3 May 2022 22:55:47 +0200 Subject: [PATCH 06/26] add command to package locales --- assets/linux.mk | 4 ++-- assets/macos.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/linux.mk b/assets/linux.mk index 4d8ba4c..2383bb9 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -18,9 +18,9 @@ build : $(outfile) $(outfile).sha256sum $(outfile) : ${MAKE} work ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package) else - 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 && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) diff --git a/assets/macos.mk b/assets/macos.mk index 200047a..5340556 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -18,9 +18,9 @@ $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum From acd83b376d6e4b5aa53c8e9b640e543743215a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Wed, 4 May 2022 01:31:19 +0200 Subject: [PATCH 07/26] bump to version 100.0-1 --- release | 2 +- source_release | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release b/release index b8626c4..d00491f 100644 --- a/release +++ b/release @@ -1 +1 @@ -4 +1 diff --git a/source_release b/source_release index b8626c4..d00491f 100644 --- a/source_release +++ b/source_release @@ -1 +1 @@ -4 +1 diff --git a/version b/version index 37bac82..e772e62 100644 --- a/version +++ b/version @@ -1 +1 @@ -99.0.1 \ No newline at end of file +100.0 \ No newline at end of file From 6bc8e5a648ff045a5d5f11c237d0ecda7676e181 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 4 May 2022 13:08:59 +0200 Subject: [PATCH 08/26] swap mach package and mach create-locales order --- assets/macos.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/macos.mk b/assets/macos.mk index 5340556..736d0b2 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -18,9 +18,9 @@ $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach package && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum From ab2a6d475681fe99c05460c772d1dbaf4d5e8377 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 4 May 2022 14:26:01 +0200 Subject: [PATCH 09/26] trying to get artifacts again by allowing locale-build to fail --- assets/macos.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/macos.mk b/assets/macos.mk index 736d0b2..fa45352 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -18,9 +18,9 @@ $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package ; cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach package && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach package && ./mach build ; cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum From 2440f7ad8fabbd103f68c366e9a98fbb8121b792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Wed, 4 May 2022 22:09:42 +0200 Subject: [PATCH 10/26] remove localization stuff from macos --- assets/macos.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/macos.mk b/assets/macos.mk index fa45352..bab5440 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -18,9 +18,9 @@ $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package ; cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach package && ./mach build ; cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum From cbf129968b666eacc6807a32f1ca4fcf387a3126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Wed, 4 May 2022 22:34:18 +0200 Subject: [PATCH 11/26] bump source release number --- source_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source_release b/source_release index d00491f..0cfbf08 100644 --- a/source_release +++ b/source_release @@ -1 +1 @@ -1 +2 From 930ac4eb9b98f51daef43ae517cda1f7af966437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 5 May 2022 16:29:25 +0200 Subject: [PATCH 12/26] fix locale package command --- assets/linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/linux.mk b/assets/linux.mk index 2383bb9..3363d70 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -18,9 +18,9 @@ build : $(outfile) $(outfile).sha256sum $(outfile) : ${MAKE} work ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./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 && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" endif cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) From af353802af5e166550b7ac2fc505eaeaa9b514e2 Mon Sep 17 00:00:00 2001 From: maltejur Date: Thu, 5 May 2022 20:10:16 +0000 Subject: [PATCH 13/26] make versioning more consistent --- Makefile | 1 + assets/linux.artifacts.mk | 20 +++++++++++--------- assets/linux.build-deb.sh | 2 +- assets/linux.build-rpm.sh | 23 ++++++++++++----------- assets/linux.mk | 3 ++- assets/macos.mk | 11 +++++++---- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 6ad2c83..d635160 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) +full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") help : @echo "Use: make [help]" diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk index 773935d..4c1dc33 100644 --- a/assets/linux.artifacts.mk +++ b/assets/linux.artifacts.mk @@ -7,22 +7,23 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) +full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 +infile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2 # # Debian based: # -librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb : $(infile) +librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile) mkdir -p work (cd work && tar xf ../$<) cp -v assets/linux.build-deb.sh work/ (cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop) ifeq ($(use_docker),false) - (cd work && bash linux.build-deb.sh $(version) $(release)) + (cd work && bash linux.build-deb.sh $(full_version)) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(full_version)" endif cp -v work/librewolf.deb $@ sha256sum $@ > $@.sha256sum @@ -30,18 +31,19 @@ endif artifacts-deb : $(infile) $(infile).sha256sum sha256sum -c $(infile).sha256sum - ${MAKE} -f assets/linux.artifacts.mk distro=$(distro) librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb + ${MAKE} -f assets/linux.artifacts.mk distro=$(distro) librewolf-$(full_version).en-US.$(distro).x86_64.deb # # RPM Based: # -librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile) +librewolf-$(full_version).$(fc).x86_64.rpm : $(infile) mkdir -p work (cd work && tar xf ../$<) cp -v assets/linux.build-rpm.sh work cp -v version work cp -v release work + cp -v source_release work cp -v assets/linux.librewolf.spec work/librewolf.spec cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico @@ -50,10 +52,10 @@ librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile) rm -f work/librewolf/precomplete rm -f work/librewolf/removed-files ifeq ($(use_docker),false) - (cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ + (cp -r work / && cd work && bash linux.build-rpm.sh $(fc)) cp -v /work/$@ $@ else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(version) $(release)" ; \ + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(fc)" cp -v work/$@ $@ endif sha256sum $@ > $@.sha256sum @@ -61,5 +63,5 @@ endif artifacts-rpm : $(infile) $(infile).sha256sum sha256sum -c $(infile).sha256sum - ${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(version)-$(release).$(fc).x86_64.rpm + ${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm diff --git a/assets/linux.build-deb.sh b/assets/linux.build-deb.sh index 0c76172..73dd88d 100755 --- a/assets/linux.build-deb.sh +++ b/assets/linux.build-deb.sh @@ -20,7 +20,7 @@ Priority: optional Provides: gnome-www-browser, www-browser, x-www-browser Section: web EOF -echo "Version: $1-$2" >>control +echo "Version: $1" >>control cd .. mkdir -p usr/share/librewolf diff --git a/assets/linux.build-rpm.sh b/assets/linux.build-rpm.sh index cf4a8ee..8528405 100755 --- a/assets/linux.build-rpm.sh +++ b/assets/linux.build-rpm.sh @@ -8,10 +8,17 @@ mkdir /artifacts version=$(cat /work/version) release=$(cat /work/release) +source_release=$(cat /work/source_release) +full_release="$source_release$(if [ $release -gt 1 ]; then echo ".$release"; fi)" +full_version="$version-$source_release$(if [ $release -gt 1 ]; then echo "-$release"; fi)" +fc=$1 echo '---' echo "--- LibreWolf version file is: $version" -echo "--- LibreWolf release is: $release" +echo "--- LibreWolf bsys5 release is: $release" +echo "--- LibreWolf source release is: $source_release" +echo "--- LibreWolf fedora release is: $full_release" +echo "--- LibreWolf full version is: $full_version" echo '---' echo '--- Contents of /artifacts folder:' ls -la /artifacts @@ -20,18 +27,14 @@ echo '--- Contents of /WORK folder:' ls -la /WORK echo '---' - - - rm -rf rpmbuild mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} -sed "s/__VERSION__/$version/g" < /work/librewolf.spec > /work/tmp.spec -sed "s/__RELEASE__/$release/g" < /work/tmp.spec > rpmbuild/SPECS/librewolf.spec +sed "s/__VERSION__/$version/g" /work/tmp.spec +sed "s/__RELEASE__/$full_release/g" rpmbuild/SPECS/librewolf.spec # copy in the librewolf assets cp -rv /work/librewolf rpmbuild/SOURCES - cd rpmbuild/SOURCES mkdir -p librewolf-$version/usr/share/librewolf @@ -47,8 +50,7 @@ cd ../../.. mkdir -p librewolf-$version/usr/share/applications mkdir -p librewolf-$version/usr/share/icons cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/librewolf.png -sed "s/MYDIR/\/usr\/share\/librewolf/g" < /work/librewolf/start-librewolf.desktop.in > librewolf-$version/usr/share/applications/librewolf.desktop - +sed "s/MYDIR/\/usr\/share\/librewolf/g" librewolf-$version/usr/share/applications/librewolf.desktop tar cvfz lw.tar.gz librewolf-$version # todo perhaps: rm -rf librwolf-$version @@ -66,6 +68,5 @@ echo '---' rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec echo '--- [debug] Copying output files to /artifacts' - #Wrote: /root/rpmbuild/RPMS/x86_64/librewolf-94.0.2-1.fc35.x86_64.rpm -cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /work +cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /work/librewolf-$full_version.$fc.x86_64.rpm diff --git a/assets/linux.mk b/assets/linux.mk index 3363d70..b6b403c 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -7,8 +7,9 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) +full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 +outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2 docker : docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile diff --git a/assets/macos.mk b/assets/macos.mk index bab5440..ddc1c4e 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -6,22 +6,25 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) +full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg +outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg docker : docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile build : $(outfile) $(outfile).sha256sum -$(outfile) $(outfile).sha256sum : +$(outfile) : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) + +$(outfile).sha256sum : $(outfile) sha256sum $(outfile) > $(outfile).sha256sum cat $(outfile).sha256sum From 424ed8f2c1dba5f175145ce92ddb34283fc37606 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 5 May 2022 22:39:27 +0200 Subject: [PATCH 14/26] v100.0-3 --- source_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source_release b/source_release index 0cfbf08..00750ed 100644 --- a/source_release +++ b/source_release @@ -1 +1 @@ -2 +3 From 446bed6c98dfa884e10386968ce80c1719c14913 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 6 May 2022 13:06:44 +0200 Subject: [PATCH 15/26] first try at fixing the naming issue by introducing new variables in variable.env --- .gitlab-ci.yml | 78 ++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8da6010..172c741 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ Build: - make $DISTRO - echo VERSION=$(cat version) >> variables.env - echo RELEASE=$(cat release) >> variables.env + - echo SOURCE_RELEASE=$(cat source_release) >> variables.env + - 't=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env' artifacts: paths: - librewolf-*.deb @@ -69,83 +71,83 @@ Release: --upload-file "$1" \ "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/$1" } - upload_package librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb - upload_package librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb.sha256sum - upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb - upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb.sha256sum - upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb - upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb.sha256sum - upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb - upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb.sha256sum - upload_package librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb - upload_package librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb.sha256sum - upload_package librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm - upload_package librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm.sha256sum - upload_package librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm - upload_package librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm.sha256sum - upload_package librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg - upload_package librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg.sha256sum - upload_package librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg - upload_package librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg.sha256sum + upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb + upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum + upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb + upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum + upload_package librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb + upload_package librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb.sha256sum + upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb + upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum + upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb + upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum + upload_package librewolf-$FILEVER.fc34.x86_64.rpm + upload_package librewolf-$FILEVER.fc34.x86_64.rpm.sha256sum + upload_package librewolf-$FILEVER.fc35.x86_64.rpm + upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum + upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg + upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum + upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg + upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum release: - tag_name: "$VERSION-$RELEASE" - description: "## LibreWolf bsys5 Release v$VERSION-$RELEASE\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))" + tag_name: "$FILEVER" + description: "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))" assets: links: - name: Debian 11 (deb) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb - name: Debian 11 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum - name: Ubuntu 20 (deb) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb - name: Ubuntu 20 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum - name: Ubuntu 21 (deb) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb - name: Ubuntu 21 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb.sha256sum - name: Ubuntu 22 (deb) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb - name: Ubuntu 22 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.ubuntu22.x86_64.deb.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum - name: Linux Mint 20 (deb) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb - name: Linux Mint 20 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum - name: Fedora 34 (rpm) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc34.x86_64.rpm - name: Fedora 34 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc34.x86_64.rpm.sha256sum - name: Fedora 35 (rpm) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm - name: Fedora 35 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum - name: macOS x86_64 (dmg) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg - name: macOS x86_64 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum - name: macOS aarch64 (dmg) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg - name: macOS aarch64 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum Update Repositories: stage: deploy From 4db0689b694fe9626f41db4d3e1f4b9462f4178c Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 6 May 2022 20:34:19 +0200 Subject: [PATCH 16/26] bugfixes --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 172c741..55e117f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ Release: curl \ --header "JOB-TOKEN: $CI_JOB_TOKEN" \ --upload-file "$1" \ - "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/$1" + "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/$1" } upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum @@ -153,6 +153,7 @@ Update Repositories: stage: deploy needs: - job: "Build" + artifacts: true - job: "Release" only: - master @@ -163,4 +164,4 @@ Update Repositories: - apt-get update - apt-get install -y curl script: - - curl "https://shorsh.de/update_lw_repos.php?version=$(cat version)-$(cat release)&log=true&token=$REPO_DEPLOY_TOKEN" + - curl "https://shorsh.de/update_lw_repos.php?version=$FILEVER&log=true&token=$REPO_DEPLOY_TOKEN" From 5deedf51639fd1f16676eddd23f2d5c653297ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Tue, 10 May 2022 22:13:44 +0200 Subject: [PATCH 17/26] add fedora36 target --- .gitlab-ci.yml | 11 ++++++++++- Makefile | 16 ++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55e117f..24b7c6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ Build: - mint20 - fedora34 - fedora35 + - fedora36 - macos-x86_64 - macos-aarch64 variables: @@ -34,7 +35,7 @@ Build: - echo VERSION=$(cat version) >> variables.env - echo RELEASE=$(cat release) >> variables.env - echo SOURCE_RELEASE=$(cat source_release) >> variables.env - - 't=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env' + - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env" artifacts: paths: - librewolf-*.deb @@ -85,6 +86,8 @@ Release: upload_package librewolf-$FILEVER.fc34.x86_64.rpm.sha256sum upload_package librewolf-$FILEVER.fc35.x86_64.rpm upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum + upload_package librewolf-$FILEVER.fc36.x86_64.rpm + upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg @@ -136,6 +139,12 @@ Release: - name: Fedora 35 (sha256sum) link_type: other url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum + - name: Fedora 36 (rpm) + link_type: package + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm + - name: Fedora 36 (sha256sum) + link_type: other + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum - name: macOS x86_64 (dmg) link_type: package url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg diff --git a/Makefile b/Makefile index d635160..9ada4ba 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 +.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 version:=$(shell cat version) release:=$(shell cat release) @@ -20,6 +20,7 @@ help : @echo " [docker-ubuntu22]" @echo " [docker-fedora34]" @echo " [docker-fedora35]" + @echo " [docker-fedora36]" @echo " [docker-macos-x86_64]" @echo " [docker-macos-aarch64]" @echo "" @@ -31,6 +32,7 @@ help : @echo " [ubuntu22]" @echo " [fedora34]" @echo " [fedora35]" + @echo " [fedora36]" @echo " [macos-x64_64]" @echo " [macos-aarch64]" @echo "" @@ -48,7 +50,7 @@ veryclean : clean prune : docker system prune --all --force -docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-macos-x86_64 docker-macos-aarch64 +docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-macos-x86_64 docker-macos-aarch64 build : ${MAKE} clean @@ -66,6 +68,8 @@ build : ${MAKE} clean ${MAKE} fedora35 ${MAKE} clean + ${MAKE} fedora36 + ${MAKE} clean ${MAKE} macos-x86_64 ${MAKE} clean ${MAKE} macos-aarch64 @@ -79,6 +83,7 @@ push : docker push librewolf/bsys5-image-ubuntu22 docker push librewolf/bsys5-image-fedora34 docker push librewolf/bsys5-image-fedora35 + docker push librewolf/bsys5-image-fedora36 docker push librewolf/bsys5-image-macos-x86_64 docker push librewolf/bsys5-image-macos-aarch64 @@ -90,6 +95,7 @@ rmi : docker rmi librewolf/bsys5-image-ubuntu22 docker rmi librewolf/bsys5-image-fedora34 docker rmi librewolf/bsys5-image-fedora35 + docker rmi librewolf/bsys5-image-fedora36 docker rmi librewolf/bsys5-image-macos-x86_64 docker rmi librewolf/bsys5-image-macos-aarch64 @@ -162,6 +168,12 @@ docker-fedora35 : fedora35 : ${MAKE} -f assets/linux.mk distro=fedora35 build ${MAKE} -f assets/linux.artifacts.mk fc=fc35 distro=fedora35 artifacts-rpm +## fedora36 +docker-fedora36 : + ${MAKE} -f assets/linux.mk distro=fedora36 "distro_image=fedora:36" docker +fedora36 : + ${MAKE} -f assets/linux.mk distro=fedora36 build + ${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm # From 3c3250f3919d9853289af10cf8b136a99e542c38 Mon Sep 17 00:00:00 2001 From: maltejur Date: Thu, 12 May 2022 21:08:04 +0000 Subject: [PATCH 18/26] Build Docker Images on GitLab --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++- Makefile | 40 +++++++++++++++++++-------------------- assets/linux.artifacts.mk | 4 ++-- assets/linux.mk | 4 ++-- assets/macos.mk | 4 ++-- 5 files changed, 65 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24b7c6f..3465eba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,46 @@ stages: + - images - build - release - deploy +Build Docker Images: + stage: images + when: manual + # only: + # - master + image: ubuntu + services: + - docker:dind + parallel: + matrix: + - DISTRO: + - debian11 + - ubuntu20 + - ubuntu21 + - ubuntu22 + - mint20 + - fedora34 + - fedora35 + - fedora36 + - macos-x86_64 + - macos-aarch64 + variables: + DOCKER_HOST: tcp://docker:2375 + # Install docker and make + before_script: + - apt-get update + - apt-get install -y ca-certificates curl gnupg lsb-release + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg + - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null + - apt-get update + - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make + # Build container + script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com + - make docker-$DISTRO + - docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest + Build: stage: build when: manual @@ -23,7 +61,7 @@ Build: variables: SOURCE_URL: $SOURCE_URL use_docker: "false" - image: librewolf/bsys5-image-$DISTRO + image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO tags: - amd64 # Build on dedicated runner diff --git a/Makefile b/Makefile index 9ada4ba..39343f7 100644 --- a/Makefile +++ b/Makefile @@ -76,28 +76,28 @@ build : ${MAKE} clean push : - docker push librewolf/bsys5-image-debian11 - docker push librewolf/bsys5-image-mint20 - docker push librewolf/bsys5-image-ubuntu20 - docker push librewolf/bsys5-image-ubuntu21 - docker push librewolf/bsys5-image-ubuntu22 - docker push librewolf/bsys5-image-fedora34 - docker push librewolf/bsys5-image-fedora35 - docker push librewolf/bsys5-image-fedora36 - docker push librewolf/bsys5-image-macos-x86_64 - docker push librewolf/bsys5-image-macos-aarch64 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora35 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora36 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64 + docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64 rmi : - docker rmi librewolf/bsys5-image-debian11 - docker rmi librewolf/bsys5-image-mint20 - docker rmi librewolf/bsys5-image-ubuntu20 - docker rmi librewolf/bsys5-image-ubuntu21 - docker rmi librewolf/bsys5-image-ubuntu22 - docker rmi librewolf/bsys5-image-fedora34 - docker rmi librewolf/bsys5-image-fedora35 - docker rmi librewolf/bsys5-image-fedora36 - docker rmi librewolf/bsys5-image-macos-x86_64 - docker rmi librewolf/bsys5-image-macos-aarch64 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora35 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora36 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64 + docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64 update : @wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version" diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk index 4c1dc33..8ce9269 100644 --- a/assets/linux.artifacts.mk +++ b/assets/linux.artifacts.mk @@ -23,7 +23,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile) ifeq ($(use_docker),false) (cd work && bash linux.build-deb.sh $(full_version)) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(full_version)" + docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "bash linux.build-deb.sh $(full_version)" endif cp -v work/librewolf.deb $@ sha256sum $@ > $@.sha256sum @@ -55,7 +55,7 @@ ifeq ($(use_docker),false) (cp -r work / && cd work && bash linux.build-rpm.sh $(fc)) cp -v /work/$@ $@ else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(fc)" + docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "bash linux.build-rpm.sh $(fc)" cp -v work/$@ $@ endif sha256sum $@ > $@.sha256sum diff --git a/assets/linux.mk b/assets/linux.mk index b6b403c..c83802e 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo " outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2 docker : - docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile + docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile build : $(outfile) $(outfile).sha256sum @@ -21,7 +21,7 @@ $(outfile) : ifeq ($(use_docker),false) (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" + docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" endif cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) diff --git a/assets/macos.mk b/assets/macos.mk index ddc1c4e..246b6b9 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo " outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg docker : - docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile + docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) - < assets/macos.Dockerfile build : $(outfile) $(outfile).sha256sum @@ -21,7 +21,7 @@ $(outfile) : ifeq ($(use_docker),false) (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) From a0afaa4b3406ce90a16847cbd8f2dd86849d886a Mon Sep 17 00:00:00 2001 From: stanzabird Date: Thu, 12 May 2022 22:00:54 +0000 Subject: [PATCH 19/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index 1293774..e642fa0 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -44,7 +44,7 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c ./mach artifact toolchain --from-build linux64-cctools-port &&\ ./mach artifact toolchain --from-build linux64-hfsplus &&\ ./mach artifact toolchain --from-build linux64-binutils &&\ - ./mach artifact toolchain --from-build linux64-clang-macosx-cross &&\ + ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\ /root/.cargo/bin/cargo install cbindgen &&\ /root/.cargo/bin/rustup target add $arch-apple-darwin &&\ cp -r binutils /root/.mozbuild &&\ From c451a43725753e139d348ad97f812349e39ea0d9 Mon Sep 17 00:00:00 2001 From: stanzabird Date: Thu, 12 May 2022 22:23:03 +0000 Subject: [PATCH 20/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index e642fa0..2a3d62a 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -44,7 +44,6 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c ./mach artifact toolchain --from-build linux64-cctools-port &&\ ./mach artifact toolchain --from-build linux64-hfsplus &&\ ./mach artifact toolchain --from-build linux64-binutils &&\ - ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\ /root/.cargo/bin/cargo install cbindgen &&\ /root/.cargo/bin/rustup target add $arch-apple-darwin &&\ cp -r binutils /root/.mozbuild &&\ @@ -56,6 +55,8 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c cd .. &&\ rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz +# ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\ + # our work happens here, on the host filesystem. WORKDIR /work VOLUME ["/work"] From 2520fdd041278100d86f20da0dfe2f5f54cf3d93 Mon Sep 17 00:00:00 2001 From: stanzabird Date: Fri, 13 May 2022 10:31:32 +0000 Subject: [PATCH 21/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index 2a3d62a..8a68319 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -44,6 +44,7 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c ./mach artifact toolchain --from-build linux64-cctools-port &&\ ./mach artifact toolchain --from-build linux64-hfsplus &&\ ./mach artifact toolchain --from-build linux64-binutils &&\ + ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\ /root/.cargo/bin/cargo install cbindgen &&\ /root/.cargo/bin/rustup target add $arch-apple-darwin &&\ cp -r binutils /root/.mozbuild &&\ @@ -55,7 +56,6 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c cd .. &&\ rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz -# ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\ # our work happens here, on the host filesystem. WORKDIR /work From 6572c3b395dcc7f8fcc1007c6b36775bfc7e04e9 Mon Sep 17 00:00:00 2001 From: stanzabird Date: Fri, 13 May 2022 12:00:12 +0000 Subject: [PATCH 22/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 45 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index 8a68319..a273693 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -33,29 +33,28 @@ RUN mkdir -p /osx-cross/MacOSX-SDKs &&\ rm -f MacOSX11.3.sdk.tar.xz # run the bootstrap -RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\ - tar xf librewolf-$version-$source_release.source.tar.gz &&\ - cd librewolf-$version-$source_release &&\ - echo ac_add_options --target=$arch-apple-darwin > mozconfig &&\ - echo ac_add_options --enable-bootstrap >> mozconfig &&\ - echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig &&\ - MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\ - ./mach artifact toolchain --from-build linux64-libdmg &&\ - ./mach artifact toolchain --from-build linux64-cctools-port &&\ - ./mach artifact toolchain --from-build linux64-hfsplus &&\ - ./mach artifact toolchain --from-build linux64-binutils &&\ - ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\ - /root/.cargo/bin/cargo install cbindgen &&\ - /root/.cargo/bin/rustup target add $arch-apple-darwin &&\ - cp -r binutils /root/.mozbuild &&\ - cp -r cctools /root/.mozbuild &&\ - cp -r clang /root/.mozbuild &&\ - cp -r dmg /root/.mozbuild &&\ - cp -r hfsplus-tools /root/.mozbuild &&\ - pip install testresources pycairo &&\ - cd .. &&\ - rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz - +RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build +RUN tar xf librewolf-$version-$source_release.source.tar.gz +WORKDIR librewolf-$version-$source_release +RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig +RUN echo ac_add_options --enable-bootstrap >> mozconfig +RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig +RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser +RUN ./mach artifact toolchain --from-build linux64-libdmg +RUN ./mach artifact toolchain --from-build linux64-cctools-port +RUN ./mach artifact toolchain --from-build linux64-hfsplus +RUN ./mach artifact toolchain --from-build linux64-binutils +RUN ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross +RUN /root/.cargo/bin/cargo install cbindgen +RUN /root/.cargo/bin/rustup target add $arch-apple-darwin +RUN cp -r binutils /root/.mozbuild +RUN cp -r cctools /root/.mozbuild +RUN cp -r clang /root/.mozbuild +RUN cp -r dmg /root/.mozbuild +RUN cp -r hfsplus-tools /root/.mozbuild +RUN pip install testresources pycairo +WORKDIR .. +RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz # our work happens here, on the host filesystem. WORKDIR /work From 88ff5ebfbc9a0d68d86660f013e1a48107023157 Mon Sep 17 00:00:00 2001 From: stanzabird Date: Fri, 13 May 2022 12:20:09 +0000 Subject: [PATCH 23/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index a273693..446b460 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -44,7 +44,7 @@ RUN ./mach artifact toolchain --from-build linux64-libdmg RUN ./mach artifact toolchain --from-build linux64-cctools-port RUN ./mach artifact toolchain --from-build linux64-hfsplus RUN ./mach artifact toolchain --from-build linux64-binutils -RUN ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross +RUN ./mach artifact toolchain --from-build linux64-clang-9-macosx-cross RUN /root/.cargo/bin/cargo install cbindgen RUN /root/.cargo/bin/rustup target add $arch-apple-darwin RUN cp -r binutils /root/.mozbuild From 2008a3323fee981204b4c0affdfc5ce18774119c Mon Sep 17 00:00:00 2001 From: stanzabird Date: Fri, 13 May 2022 12:44:37 +0000 Subject: [PATCH 24/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index 446b460..e373620 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -44,7 +44,7 @@ RUN ./mach artifact toolchain --from-build linux64-libdmg RUN ./mach artifact toolchain --from-build linux64-cctools-port RUN ./mach artifact toolchain --from-build linux64-hfsplus RUN ./mach artifact toolchain --from-build linux64-binutils -RUN ./mach artifact toolchain --from-build linux64-clang-9-macosx-cross +RUN ./mach artifact toolchain --from-build toolchain-linux64-clang-9-macosx-cross RUN /root/.cargo/bin/cargo install cbindgen RUN /root/.cargo/bin/rustup target add $arch-apple-darwin RUN cp -r binutils /root/.mozbuild From 71a7bf3dd2c6ea546f652c92927c339d4cb74cdd Mon Sep 17 00:00:00 2001 From: stanzabird Date: Fri, 13 May 2022 14:25:47 +0000 Subject: [PATCH 25/26] Update assets/macos.Dockerfile --- assets/macos.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index e373620..50e4b28 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -44,7 +44,7 @@ RUN ./mach artifact toolchain --from-build linux64-libdmg RUN ./mach artifact toolchain --from-build linux64-cctools-port RUN ./mach artifact toolchain --from-build linux64-hfsplus RUN ./mach artifact toolchain --from-build linux64-binutils -RUN ./mach artifact toolchain --from-build toolchain-linux64-clang-9-macosx-cross +RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross RUN /root/.cargo/bin/cargo install cbindgen RUN /root/.cargo/bin/rustup target add $arch-apple-darwin RUN cp -r binutils /root/.mozbuild From e1fafc38a26863ba26d7ae3f917b0427a7e9637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Fri, 13 May 2022 16:58:22 +0200 Subject: [PATCH 26/26] fix locales on macos --- assets/macos.mk | 4 ++-- assets/macos.mozconfig | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/macos.mk b/assets/macos.mk index 246b6b9..a3b497b 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -19,9 +19,9 @@ $(outfile) : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) else - docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig index eba9dd4..e236eaa 100644 --- a/assets/macos.mozconfig +++ b/assets/macos.mozconfig @@ -47,6 +47,8 @@ ac_add_options --with-branding=browser/branding/librewolf ac_add_options --with-unsigned-addon-scopes=app,system +ac_add_options --with-l10n-base=$PWD/browser/locales/l10n + export MOZ_REQUIRE_SIGNING= mk_add_options MOZ_CRASHREPORTER=0