From a65e96ecbc40506aa58f29a39bb282732ce7660f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 9 May 2022 21:50:01 +0200 Subject: [PATCH] changes --- .gitlab-ci.yml | 6 +++--- Makefile | 36 ++++++++++++++++++------------------ assets/linux.artifacts.mk | 4 ++-- assets/linux.mk | 2 +- assets/macos.mk | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1579ecd..8aa6671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,11 @@ stages: - - build-images + - buildImages - build - release - deploy Build Docker Images: - stage: build-images + stage: buildImages when: manual # only: # - master @@ -59,7 +59,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 d635160..afbc497 100644 --- a/Makefile +++ b/Makefile @@ -72,26 +72,26 @@ 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-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/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-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/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 2c2dded..c83802e 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -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 a85666b..111fdb1 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -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)