.gitlab-ci.yml

@@ -15,13 +15,14 @@ Images:
     matrix:
       - DISTRO:
           - debian11
-          - debian12
           - ubuntu20
           - ubuntu22
           - mint20
           - mint21
           - fedora37
           - fedora38
+          - macos-x86_64
+          - macos-aarch64
           - dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
@@ -38,13 +39,14 @@ Build:
     matrix:
       - DISTRO:
           - debian11
-          - debian12
           - ubuntu20
           - ubuntu22
           - mint20
           - mint21
           - fedora37
           - fedora38
+          - macos-x86_64
+          - macos-aarch64
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale
@@ -55,13 +57,17 @@ Build:
     - echo VERSION=$(cat version) >> variables.env
     - echo RELEASE=$(cat release) >> variables.env
     - echo SOURCE_RELEASE=$(cat source_release) >> variables.env
-    - "t=$(cat version)-$(cat source_release) ; if ! grep 1 release; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
+    - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ];
+      then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo
+      FILEVER=$t >> variables.env"
   artifacts:
     paths:
       - librewolf-*.deb
       - librewolf-*.deb.sha256sum
       - librewolf-*.rpm
       - librewolf-*.rpm.sha256sum
+      - librewolf-*.dmg
+      - librewolf-*.dmg.sha256sum
       - librewolf-*-setup.exe
       - librewolf-*-setup.exe.sha256sum
       - librewolf-*-portable.zip
@@ -102,8 +108,6 @@ Release:
 
       upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb
       upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
       upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
       upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
       upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
@@ -116,6 +120,10 @@ Release:
       upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
       upload_package librewolf-$FILEVER.fc38.x86_64.rpm
       upload_package librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
+      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
+      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
+      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
+      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
 
       echo "Creating Codeberg release"
       codeberg_release_body="${codeberg_release_body}\n[View on GitLab](https://gitlab.com/librewolf-community/browser/bsys5/-/releases/$FILEVER)"
@@ -137,10 +145,6 @@ Release:
             "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
             "distros": ["bullseye"]
           },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb",
-            "distros": ["bookworm"]
-          },
           {
             "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
             "distros": ["focal"]
@@ -187,12 +191,6 @@ Release:
         - name: Debian 11 (sha256sum)
           link_type: other
           url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
-        - name: Debian 12 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb
-        - name: Debian 12 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
         - name: Ubuntu 20 (deb)
           link_type: package
           url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
@@ -229,3 +227,15 @@ Release:
         - name: Fedora 38 (sha256sum)
           link_type: other
           url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
+        - name: macOS x86_64 (dmg)
+          link_type: package
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
+        - name: macOS x86_64 (sha256sum)
+          link_type: other
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
+        - name: macOS aarch64 (dmg)
+          link_type: package
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg
+        - name: macOS aarch64 (sha256sum)
+          link_type: other
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum

Makefile

@@ -13,7 +13,7 @@ help :
 	@echo "          [update] [prune]         - misc."
 	@echo ""
 	@echo "docker targets:" 
-	@echo "  [docker-debian11], [docker-debian12],[docker-mint20], [docker-mint21]"
+	@echo "  [docker-debian11], [docker-mint20], [docker-mint21]"
 	@echo "  [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
 	@echo "  [docker-fedora37], [docker-fedora38]"
 	@echo "  [docker-macos-x86_64], [docker-macos-aarch64]"
@@ -22,7 +22,7 @@ help :
 	@echo "  [docker-windows]"
 	@echo ""
 	@echo "build targets:" 
-	@echo "  [debian11], [debian12], [mint20], [mint21], [ubuntu20], [ubuntu21]"
+	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
 	@echo "  [ubuntu22]"
 	@echo "  [fedora37], [fedora38]"
 	@echo "  [macos-x64_64], [macos-aarch64]"
@@ -44,14 +44,12 @@ veryclean : clean
 prune :
 	docker system prune --all --force
 
-docker : docker-debian11 docker-debian12 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora38 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
+docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora38 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
 
 build :
 	${MAKE} clean
 	${MAKE} debian11
 	${MAKE} clean
-	${MAKE} debian12
-	${MAKE} clean
 	${MAKE} mint20
 	${MAKE} clean
 	${MAKE} mint21
@@ -79,7 +77,6 @@ build :
 
 push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
-	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian12
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint21
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
@@ -95,7 +92,6 @@ push :
 
 rmi :
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
-	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian12
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint21
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
@@ -146,12 +142,6 @@ docker-debian11 :
 debian11 :
 	${MAKE} -f assets/linux.mk distro=debian11 build
 	${MAKE} -f assets/linux.artifacts.mk distro=debian11 artifacts-deb
-## debian12
-docker-debian12 :
-	${MAKE} -f assets/linux.mk distro=debian12 "distro_image=debian:bookworm" docker
-debian12 :
-	${MAKE} -f assets/linux.mk distro=debian12 build
-	${MAKE} -f assets/linux.artifacts.mk distro=debian12 artifacts-deb
 ## mint20
 docker-mint20 :
 	${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker

README.md

@@ -12,7 +12,7 @@ scripts.
 | Platform                 | x86_64                  | aarch64            |
 | ------------------------ | ----------------------- | ------------------ |
 | Linux                    |                         |                    |
-| └─ Debian (deb)          | ✅ (debian11,debian12)  | -                  |
+| └─ Debian (deb)          | ✅ (debian11)           | -                  |
 | └─ Ubuntu (deb)          | ✅ (ubuntu20, ubuntu22) | -                  |
 | └─ Mint (deb)            | ✅ (mint20, mint21)     | -                  |
 | └─ Fedora (rpm)          | ✅ (fedora38, fedora37) | -                  |

assets/linux.Dockerfile

@@ -14,7 +14,7 @@ ENV TZ=Europe/Amsterdam
 
 
 # dependencies needed to run ./mach bootstrap
-RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget ; apt-get -y install dpkg-sig; true)
+RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true)
 RUN ( dnf -y upgrade && dnf -y install python3 python3-devel gcc wget rpm-build rpm-sign ; true)
 RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true)
 

assets/linux.build-deb.sh

@@ -47,8 +47,8 @@ cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop
 cd ..
 dpkg-deb --build librewolf
 
-# Sign the deb file if private key is provided and we have dpkg-sig available
-if [[ -f pk.asc ]] && command -v dpkg-sig &>/dev/null; then
+# Sign the deb file if private key is provided
+if [[ -f pk.asc ]]; then
   gpg --import pk.asc
   dpkg-sig --sign builder librewolf.deb
 fi

assets/linux.build-rpm.sh

@@ -43,9 +43,6 @@ rm -rf /usr/src && ln -sv /WORK /usr/src # Required for openSUSE
 sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
 sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.spec
 
-# fix: remove some tool binaries we don't want
-rm -f /work/librewolf/{glxtest,vaapitest}
-
 # copy in the librewolf assets
 cp -rv /work/librewolf rpmbuild/SOURCES
 

version

@@ -1 +1 @@
-116.0.2
+113.0.2