(couchdb-pkg) branch main updated: Add Ubuntu Noble (24.04 LTS) package support

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


The following commit(s) were added to refs/heads/main by this push:
     new a79a290  Add Ubuntu Noble (24.04 LTS) package support
a79a290 is described below

commit a79a2900978c06ab115f812010885b499551e671
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Mon Dec 9 15:59:04 2024 -0500

    Add Ubuntu Noble (24.04 LTS) package support
---
 Makefile                | 13 +++++++++++++
 build.sh                |  7 ++++---
 repo/conf/distributions |  5 +++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4e56889..6a80bf8 100644
--- a/Makefile
+++ b/Makefile
@@ -154,6 +154,19 @@ s390x-ubuntu-jammy: ubuntu-jammy
 arm64-ubuntu-jammy: ubuntu-jammy
 ppc64le-ubuntu-jammy: ubuntu-jammy
 
+# Ubuntu 24.04 (Noble)
+ubuntu-noble: PLATFORM=noble
+ubuntu-noble: DIST=ubuntu-noble
+ubuntu-noble: SPIDERMONKEY=libmozjs-115-0
+ubuntu-noble: SPIDERMONKEY_DEV=libmozjs-115-dev
+ubuntu-noble: SM_VER=115
+ubuntu-noble: noble
+noble: debian
+
+s390x-ubuntu-noble: ubuntu-noble
+arm64-ubuntu-noble: ubuntu-noble
+ppc64le-ubuntu-noble: ubuntu-noble
+
 # RPM default
 centos: PKGDIR=../rpmbuild/RPMS/$(PKGARCH)
 centos: find-couch-dist link-couch-dist build-rpm copy-pkgs
diff --git a/build.sh b/build.sh
index f3792ef..5635c42 100755
--- a/build.sh
+++ b/build.sh
@@ -29,9 +29,9 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # TODO derive these by interrogating the couchdb-ci repo rather than hard coding the list
 DEBIANS="debian-bullseye debian-bookworm"
-UBUNTUS="ubuntu-focal ubuntu-jammy"
+UBUNTUS="ubuntu-focal ubuntu-jammy ubuntu-noble"
 CENTOSES="centos-8 centos-9"
-XPLAT_BASES="debian-bullseye debian-bookworm ubuntu-focal ubuntu-jammy centos-8 centos-9"
+XPLAT_BASES="debian-bullseye debian-bookworm ubuntu-focal ubuntu-jammy ubuntu-noble centos-8 centos-9"
 XPLAT_ARCHES="arm64 ppc64le s390x"
 BINARY_API="https://apache.jfrog.io/artifactory"
 ERLANGVERSION=${ERLANGVERSION:-25.3.2.15}
@@ -122,7 +122,8 @@ build-all-couch() {
               ( ${base} == "debian-bullseye" && ${arch} == "s390x") ||
               ( ${base} == "debian-bookworm" && ${arch} == "ppc64le" ) ||
               ( ${base} == "ubuntu-focal" && ${arch} == "ppc64le" ) ||
-              ( ${base} == "ubuntu-jammy" && ${arch} == "ppc64le" )
+              ( ${base} == "ubuntu-jammy" && ${arch} == "ppc64le" ) ||
+              ( ${base} == "ubuntu-noble" && ${arch} == "ppc64le" )
       ]]; then
         CONTAINERARCH="${arch}" build-couch ${base}
       fi
diff --git a/repo/conf/distributions b/repo/conf/distributions
index ac9255c..817d119 100644
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -17,3 +17,8 @@ Codename: jammy
 Components: main
 Architectures: amd64 arm64 ppc64el
 Description: Official CouchDB Ubuntu 22.04 jammy repository
+
+Codename: noble
+Components: main
+Architectures: amd64 arm64 ppc64el
+Description: Official CouchDB Ubuntu 24.04 noble repository