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

Merge branch 'master' into mingw32

This commit is contained in:
Bert van der Weerd 2022-06-20 13:00:51 +02:00
parent 4e1f6436c1 1b032488e4
commit b92f332bed
No known key found for this signature in database
GPG Key ID: 73370A0B9E5516B0
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -61,9 +61,7 @@ Build:
use_docker: "false"
image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
tags:
- amd64
# Build on dedicated runner
- dedicated
- autoscale
except:
- merge_requests
script:

4
assets/linux.mk
View File

@ -19,9 +19,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)
(cd work/librewolf-$(version)-$(source_release) && ./mach build && echo "Packaging... (output hidden)" && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
else
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 && echo Packaging... && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null"
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 && echo "Packaging... (output hidden)" && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null"
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)

4
assets/macos.mk
View File

@ -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 && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales)
(cd work/librewolf-$(version)-$(source_release) && ./mach build && echo "Packaging... (output hidden)" && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
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 && echo Packaging... && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null"
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 && echo Packaging... (output hidden) && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null"
endif
cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)

2
source_release
View File

@ -1 +1 @@
2
1

2
version
View File

@ -1 +1 @@
101.0
101.0.1