Merge branch 'main' of https://codeberg.org/librewolf/source

Author: frap129

.gitlab-ci.yml

@@ -20,7 +20,7 @@ Linux:
     - make test-linux
   artifacts:
     paths:
-      - librewolf-*.tar.bz2
+      - librewolf-*.tar.xz
       - mozconfig.txt
 
 macOS:

Makefile

@@ -168,7 +168,7 @@ build : $(lw_source_dir)
 
 package :
 	(cd $(lw_source_dir) && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales)
-	cp -v $(lw_source_dir)/obj-*/dist/hyperfox-$(version)-$(release).en-US.*.tar.bz2 .
+	cp -v $(lw_source_dir)/obj-*/dist/hyperfox-$(version)-$(release).en-US.*.tar.xz .
 
 run :
 	(cd $(lw_source_dir) && ./mach run)
@@ -200,7 +200,7 @@ docker-build-image :
 	docker build --no-cache -t $(build_image) - < assets/Dockerfile
 
 docker-run-build-job :
-	docker run -v $$(pwd):/output --rm $(build_image) sh -c "git pull && make fetch && make build package && cp -v ./*.bz2 /output"
+	docker run -v $$(pwd):/output --rm $(build_image) sh -c "git pull && make fetch && make build package && cp -v ./*.xz /output"
 
 docker-remove-image :
 	docker rmi $(build_image)
@@ -234,9 +234,9 @@ fetch-upstream-woodpecker : fetch
 
 test : full-test
 
-# full-test: produce the bz2 artifact using bsys6 from scratch
+# full-test: produce the xz artifact using bsys6 from scratch
 full-test : $(lw_source_tarball)
-	${MAKE} -f assets/testing.mk bsys6_x86_64_linux_bz2_artifact
+	${MAKE} -f assets/testing.mk bsys6_x86_64_linux_xz_artifact
 
 test-linux : full-test
 

assets/testing.mk

@@ -1,4 +1,4 @@
-.PHONY : bsys6_x86_64_linux_bz2_artifact full_build_stage2_linux bsys6_x86_64_macos_dmg_artifact full_build_stage2_macos bsys6_x86_64_windows_zip_artifact full_build_stage2_windows
+.PHONY : bsys6_x86_64_linux_xz_artifact full_build_stage2_linux bsys6_x86_64_macos_dmg_artifact full_build_stage2_macos bsys6_x86_64_windows_zip_artifact full_build_stage2_windows
 
 #
 # This makefile just uses bsys6 to build the package
@@ -11,12 +11,12 @@
 #
 
 
-bsys6_x86_64_linux_bz2_artifact :
+bsys6_x86_64_linux_xz_artifact :
 
 	rm -rf bsys6
 	git clone "https://codeberg.org/librewolf/bsys6.git"
 	(cd bsys6 && ${MAKE} -f ../assets/testing.mk full_build_stage2_linux)
-	cp -v bsys6/*.bz2 .
+	cp -v bsys6/*.xz .
 	cp -v "bsys6/SOURCEDIR/librewolf-$$(cat version)-$$(cat release)/mozconfig" mozconfig.txt
 	rm -rf bsys6
 

version

@@ -1 +1 @@
-134.0.2
+135.0