From 058b73096c590fb649ca10628b1a59bc4f2d808d Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 10 Dec 2021 16:38:00 +0100 Subject: [PATCH] feat(linux): Add support for Ubuntu 22.04 Jammy Partially implements #5032. --- linux/.pbuilderrc | 2 +- linux/Jenkinsfile | 2 +- linux/scripts/cow.sh | 2 +- linux/scripts/launchpad.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/.pbuilderrc b/linux/.pbuilderrc index 7eb25cb256..0257f09b30 100644 --- a/linux/.pbuilderrc +++ b/linux/.pbuilderrc @@ -14,7 +14,7 @@ DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $STABLE_BAC "experimental" "unstable" "testing" "stable") # List of Ubuntu suites. Update these when needed. -UBUNTU_SUITES=("impish" "hirsute" "groovy" "focal" "bionic") +UBUNTU_SUITES=("jammy" "impish" "hirsute" "focal" "bionic") # Mirrors to use. Update these to your preferred mirror. DEBIAN_MIRROR="deb.debian.org" diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile index 46ab0f7508..fa111cfbe2 100644 --- a/linux/Jenkinsfile +++ b/linux/Jenkinsfile @@ -5,7 +5,7 @@ @Library('lsdev-pipeline-library') _ keymanPackaging { - distributionsToPackage = 'bionic focal hirsute' + distributionsToPackage = 'bionic focal hirsute jammy' arches = 'amd64 i386' packagesToBuild = ['keyman', 'kmflcomp', 'libkmfl', 'ibus-kmfl'] } diff --git a/linux/scripts/cow.sh b/linux/scripts/cow.sh index 957ed3dc98..ab5768a92f 100755 --- a/linux/scripts/cow.sh +++ b/linux/scripts/cow.sh @@ -3,7 +3,7 @@ # If needed set cowbuilder up for building Keyman Debian packages # Then cowbuilder update -distributions='bionic focal hirsute impish' +distributions='bionic focal hirsute impish jammy' dpkgcheck=`dpkg-query -l cowbuilder` if [ $? != 0 ]; then diff --git a/linux/scripts/launchpad.sh b/linux/scripts/launchpad.sh index 6e2ff177ac..041dc6a909 100755 --- a/linux/scripts/launchpad.sh +++ b/linux/scripts/launchpad.sh @@ -40,7 +40,7 @@ echo "ppa: ${ppa}" if [ "${DIST}" != "" ]; then distributions="${DIST}" else - distributions="bionic focal hirsute impish" + distributions="bionic focal hirsute impish jammy" fi if [ "${PACKAGEVERSION}" != "" ]; then