From 5c385c24ce587a7a2ca225aece3d3b2163afc9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Sun, 7 Aug 2022 21:19:44 +0200 Subject: [PATCH] add mint21 target --- .gitlab-ci.yml | 14 ++++++++++++++ Makefile | 16 ++++++++++++++-- README.md | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82f207e..3294494 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ Build Docker Images: - ubuntu20 - ubuntu22 - mint20 + - mint21 - fedora35 - fedora36 - tumbleweed @@ -44,6 +45,7 @@ Build: - ubuntu20 - ubuntu22 - mint20 + - mint21 - fedora35 - fedora36 - tumbleweed @@ -104,6 +106,8 @@ Release: upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum + upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb + upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum upload_package librewolf-$FILEVER.fc35.x86_64.rpm upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum upload_package librewolf-$FILEVER.fc36.x86_64.rpm @@ -143,6 +147,12 @@ Release: - name: Linux Mint 20 (sha256sum) link_type: other url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum + - name: Linux Mint 21 (deb) + link_type: package + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb + - name: Linux Mint 21 (sha256sum) + link_type: other + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum - name: Fedora 35 (rpm) link_type: package url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm @@ -209,6 +219,10 @@ Update Repositories: { "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb", "distros": ["uma", "una"] + }, + { + "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb", + "distros": ["vanessa"] } ], "rpms": [ diff --git a/Makefile b/Makefile index 6a04f6f..fed1200 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind +.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind version:=$(shell cat version) release:=$(shell cat release) @@ -15,6 +15,7 @@ help : @echo "docker targets:" @echo " [docker-debian11]" @echo " [docker-mint20]" + @echo " [docker-mint21]" @echo " [docker-ubuntu20]" @echo " [docker-ubuntu21]" @echo " [docker-ubuntu22]" @@ -29,6 +30,7 @@ help : @echo "build targets:" @echo " [debian11]" @echo " [mint20]" + @echo " [mint21]" @echo " [ubuntu20]" @echo " [ubuntu21]" @echo " [ubuntu22]" @@ -54,7 +56,7 @@ veryclean : clean prune : docker system prune --all --force -docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 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-fedora35 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind build : ${MAKE} clean @@ -62,6 +64,8 @@ build : ${MAKE} clean ${MAKE} mint20 ${MAKE} clean + ${MAKE} mint21 + ${MAKE} clean ${MAKE} ubuntu20 ${MAKE} clean ${MAKE} ubuntu21 @@ -84,6 +88,7 @@ build : push : docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11 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 docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21 docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22 @@ -98,6 +103,7 @@ push : rmi : docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11 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 docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21 docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22 @@ -152,6 +158,12 @@ docker-mint20 : mint20 : ${MAKE} -f assets/linux.mk distro=mint20 build ${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb +## mint21 +docker-mint21 : + ${MAKE} -f assets/linux.mk distro=mint21 "distro_image=linuxmintd/mint21-amd64" docker +mint21 : + ${MAKE} -f assets/linux.mk distro=mint21 build + ${MAKE} -f assets/linux.artifacts.mk distro=mint21 artifacts-deb ## ubuntu20 docker-ubuntu20 : ${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:focal" docker diff --git a/README.md b/README.md index e548e91..a003fcd 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ scripts. | Linux | | | | └─ Debian (deb) | ✅ (debian11) | - | | └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - | -| └─ Mint (deb) | ✅ (mint20) | - | +| └─ Mint (deb) | ✅ (mint20, mint21) | - | | └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - | | └─ openSUSE (rpm) | ✅ (tumbleweed) | - | | MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |