From b737e5783f4ab80134260f6013fcf3f8c667b7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Sun, 11 Jun 2023 10:30:37 +0200 Subject: [PATCH] add debian 12 target --- .gitlab-ci.yml | 14 ++++++++++++++ Makefile | 16 +++++++++++++--- README.md | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d079fc7..1ed49ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ Images: matrix: - DISTRO: - debian11 + - debian12 - ubuntu20 - ubuntu22 - mint20 @@ -39,6 +40,7 @@ Build: matrix: - DISTRO: - debian11 + - debian12 - ubuntu20 - ubuntu22 - mint20 @@ -108,6 +110,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 @@ -145,6 +149,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 +199,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 diff --git a/Makefile b/Makefile index f152fa5..88aba3f 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 4a02568..1a8e843 100644 --- 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) | - |