xavi
/
bsys5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changes

This commit is contained in:
Malte Jürgens 2022-05-09 21:50:01 +02:00
parent 96d14c4c87
commit a65e96ecbc
No known key found for this signature in database
GPG Key ID: D29FBD5F93C0CFC3
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -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

36
Makefile
View File

@ -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"

4
assets/linux.artifacts.mk
View File

@ -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

2
assets/linux.mk
View File

@ -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)

2
assets/macos.mk
View File

@ -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)