v116.0.2-1

bump to v116.0-1
release v115.0.2-2
2023-08-09 09:30:54 +02:00 · 2023-08-02 00:43:35 +02:00 · 2023-07-12 14:51:03 +02:00 · 2023-07-12 13:40:27 +02:00 · 2023-07-10 15:33:14 +02:00 · 2023-07-09 22:55:22 +02:00
6 changed files with 33 additions and 33 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -15,14 +15,13 @@ 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
@ -39,14 +38,13 @@ 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
@ -57,17 +55,13 @@ 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) ; grep 1 release ; if [ ! $? ];
-      then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo
-      FILEVER=$t >> 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"
  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
@ -108,6 +102,8 @@ 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
@ -120,10 +116,6 @@ 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)"
@ -145,6 +137,10 @@ 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"]
@ -191,6 +187,12 @@ 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
@ -227,15 +229,3 @@ 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
--- a/16
+++ b/16
@ -13,7 +13,7 @@ help :
 	@echo "          [update] [prune]         - misc."
 	@echo ""
 	@echo "docker targets:" 
-	@echo "  [docker-debian11], [docker-mint20], [docker-mint21]"
+	@echo "  [docker-debian11], [docker-debian12],[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], [mint20], [mint21], [ubuntu20], [ubuntu21]"
+	@echo "  [debian11], [debian12], [mint20], [mint21], [ubuntu20], [ubuntu21]"
 	@echo "  [ubuntu22]"
 	@echo "  [fedora37], [fedora38]"
 	@echo "  [macos-x64_64], [macos-aarch64]"
@ -44,12 +44,14 @@ veryclean : clean
 prune :
 	docker system prune --all --force

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

 build :
 	${MAKE} clean
 	${MAKE} debian11
 	${MAKE} clean
+	${MAKE} debian12
+	${MAKE} clean
 	${MAKE} mint20
 	${MAKE} clean
 	${MAKE} mint21
@ -77,6 +79,7 @@ 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
@ -92,6 +95,7 @@ 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
@ -142,6 +146,12 @@ 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
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ scripts.
 | Platform                 | x86_64                  | aarch64            |
 | ------------------------ | ----------------------- | ------------------ |
 | Linux                    |                         |                    |
-| └─ Debian (deb)          | ✅ (debian11)           | -                  |
+| └─ Debian (deb)          | ✅ (debian11,debian12)  | -                  |
 | └─ Ubuntu (deb)          | ✅ (ubuntu20, ubuntu22) | -                  |
 | └─ Mint (deb)            | ✅ (mint20, mint21)     | -                  |
 | └─ Fedora (rpm)          | ✅ (fedora38, fedora37) | -                  |
--- a/assets/linux.Dockerfile
+++ b/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 dpkg-sig ; true)
+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 ( 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)

--- a/assets/linux.build-deb.sh
+++ b/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
-if [[ -f pk.asc ]]; then
+# 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
  gpg --import pk.asc
  dpkg-sig --sign builder librewolf.deb
 fi
--- a/2
+++ b/2
@ -1 +1 @@
-114.0
+116.0.2
Author	SHA1	Message	Date
Bert van der Weerd	bdee933bb7	v116.0.2-1	2023-08-09 09:30:54 +02:00
Bert van der Weerd	cd229782af	bump to v116.0-1	2023-08-02 00:43:35 +02:00
Bert van der Weerd	cb0418a125	release v115.0.2-2	2023-07-12 14:51:03 +02:00
Bert van der Weerd	8f607da74f	v115.0.2-1 builds	2023-07-12 13:40:27 +02:00
Bert van der Weerd	ecbc75b72c	removed macOS from builds. v6 will now build macOS instead	2023-07-10 15:33:14 +02:00
Malte Jürgens	e6d0d3a00e	115.0.1-1	2023-07-09 22:55:22 +02:00
stanzabird	a09088b453	115.0	2023-07-08 20:10:06 +00:00
Bert van der Weerd	af044e3304	Merge branch 'master' of gitlab.com:librewolf-community/browser/bsys5	2023-06-23 13:21:36 +02:00
Bert van der Weerd	083f14d8c7	update to version 114.0.2-1	2023-06-23 13:21:26 +02:00
Malte Jürgens	f4dfbce94b	fix ci	2023-06-15 23:20:50 +02:00
Malte Jürgens	fa50ab2279	114.0.1-2-2	2023-06-12 19:02:42 +02:00
Malte Jürgens	8e511a8753	fix missing dpkg-sig	2023-06-12 19:02:02 +02:00
Malte Jürgens	b737e5783f	add debian 12 target	2023-06-11 10:30:37 +02:00
Bert van der Weerd	4070c5bdeb	bump to 114.0.1-2	2023-06-10 10:57:35 +02:00
Bert van der Weerd	e199efddca	bump version to 114.0.1-1	2023-06-10 01:35:54 +02:00
 @ -1 +1 @@
 .0
 .0.2