Merge branch 'master' into mingw32
This commit is contained in:
commit
b92f332bed
|
@ -61,9 +61,7 @@ Build:
|
||||||
use_docker: "false"
|
use_docker: "false"
|
||||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
|
image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
|
||||||
tags:
|
tags:
|
||||||
- amd64
|
- autoscale
|
||||||
# Build on dedicated runner
|
|
||||||
- dedicated
|
|
||||||
except:
|
except:
|
||||||
- merge_requests
|
- merge_requests
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -19,9 +19,9 @@ build : $(outfile) $(outfile).sha256sum
|
||||||
$(outfile) :
|
$(outfile) :
|
||||||
${MAKE} work
|
${MAKE} work
|
||||||
ifeq ($(use_docker),false)
|
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
|
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
|
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)
|
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)
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,9 @@ $(outfile) :
|
||||||
${MAKE} work
|
${MAKE} work
|
||||||
sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
|
sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
|
||||||
ifeq ($(use_docker),false)
|
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
|
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
|
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)
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2
|
1
|
||||||
|
|
Loading…
Reference in New Issue