Skip to content

Add Ubuntu Noble (24.04 LTS) package support #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Add Ubuntu Noble (24.04 LTS) package support #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions repo/conf/distributions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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