add debian 12 target

This commit is contained in:
Malte Jürgens 2023-06-11 10:30:37 +02:00
parent 4070c5bdeb
commit b737e5783f
Signed by: maltejur
GPG key ID: D29FBD5F93C0CFC3
3 changed files with 28 additions and 4 deletions

View file

@ -15,6 +15,7 @@ Images:
matrix: matrix:
- DISTRO: - DISTRO:
- debian11 - debian11
- debian12
- ubuntu20 - ubuntu20
- ubuntu22 - ubuntu22
- mint20 - mint20
@ -39,6 +40,7 @@ Build:
matrix: matrix:
- DISTRO: - DISTRO:
- debian11 - debian11
- debian12
- ubuntu20 - ubuntu20
- ubuntu22 - ubuntu22
- mint20 - 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
upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum 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
upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb 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", "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
"distros": ["bullseye"] "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", "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
"distros": ["focal"] "distros": ["focal"]
@ -191,6 +199,12 @@ Release:
- name: Debian 11 (sha256sum) - name: Debian 11 (sha256sum)
link_type: other 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 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) - name: Ubuntu 20 (deb)
link_type: package link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb

View file

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

View file

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