From 468ae43323383ac47f83b689a57c8a2868538b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 9 May 2022 22:06:53 +0200 Subject: [PATCH] fix error --- Makefile | 8 ++++---- assets/macos.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index afbc497..22e99fc 100644 --- a/Makefile +++ b/Makefile @@ -79,8 +79,8 @@ push : 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 + 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 registry.gitlab.com/librewolf-community/browser/bsys5/debian11 @@ -90,8 +90,8 @@ rmi : 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 + 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/macos.mk b/assets/macos.mk index 111fdb1..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 registry.gitlab.com/librewolf-community/browser/bsys5/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 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 && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)