librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

fix error

Browse source
This commit is contained in:
Malte Jürgens 2022-05-09 22:06:53 +02:00
parent a65e96ecbc
commit 468ae43323
Signed by: maltejur
GPG key ID: D29FBD5F93C0CFC3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -79,8 +79,8 @@ push :
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22 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/fedora34
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora35 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-x86_64
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos:aarch64 docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
rmi : rmi :
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11 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/ubuntu22
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34 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/fedora35
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos:x86_64 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-aarch64
update : update :
@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version" @wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"

4
assets/macos.mk
View file

@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
docker : 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 build : $(outfile) $(outfile).sha256sum
@ -21,7 +21,7 @@ $(outfile) :
ifeq ($(use_docker),false) ifeq ($(use_docker),false)
(cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package)
else 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 endif
cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)