Skip to content

Remove Ubuntu Focal #191

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
Jun 20, 2025
Merged

Remove Ubuntu Focal #191

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,43 +111,6 @@ s390x-debian-bookworm: bookworm

bookworm: debian

# Ubuntu 20.04 (Focal)
ubuntu-focal: PLATFORM=focal
ubuntu-focal: DIST=ubuntu-focal
ubuntu-focal: SPIDERMONKEY=libmozjs-68-0
ubuntu-focal: SPIDERMONKEY_DEV=libmozjs-68-dev
ubuntu-focal: SM_VER=68
ubuntu-focal: focal
focal: debian

arm64-ubuntu-focal: PLATFORM=focal
arm64-ubuntu-focal: DIST=ubuntu-focal
arm64-ubuntu-focal: SPIDERMONKEY=libmozjs-68-0
arm64-ubuntu-focal: SPIDERMONKEY_DEV=libmozjs-68-dev
arm64-ubuntu-focal: SM_VER=68
arm64-ubuntu-focal: focal

aarch64-ubuntu-focal: PLATFORM=focal
aarch64-ubuntu-focal: DIST=ubuntu-focal
aarch64-ubuntu-focal: SPIDERMONKEY=libmozjs-68-0
aarch64-ubuntu-focal: SPIDERMONKEY_DEV=libmozjs-68-dev
aarch64-ubuntu-focal: SM_VER=68
aarch64-ubuntu-focal: focal

ppc64le-ubuntu-focal: PLATFORM=focal
ppc64le-ubuntu-focal: DIST=ubuntu-focal
ppc64le-ubuntu-focal: SPIDERMONKEY=libmozjs-68-0
ppc64le-ubuntu-focal: SPIDERMONKEY_DEV=libmozjs-68-dev
ppc64le-ubuntu-focal: SM_VER=68
ppc64le-ubuntu-focal: focal

s390x-ubuntu-focal: PLATFORM=focal
s390x-ubuntu-focal: DIST=ubuntu-focal
s390x-ubuntu-focal: SPIDERMONKEY=libmozjs-68-0
s390x-ubuntu-focal: SPIDERMONKEY_DEV=libmozjs-68-dev
s390x-ubuntu-focal: SM_VER=68
s390x-ubuntu-focal: focal

# Ubuntu 22.04 (Jammy)
ubuntu-jammy: PLATFORM=jammy
ubuntu-jammy: DIST=ubuntu-jammy
Expand Down
5 changes: 2 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 ubuntu-noble"
UBUNTUS="ubuntu-jammy ubuntu-noble"
CENTOSES="centos-8 centos-9"
XPLAT_BASES="debian-bullseye debian-bookworm ubuntu-focal ubuntu-jammy ubuntu-noble centos-8 centos-9"
XPLAT_BASES="debian-bullseye debian-bookworm ubuntu-jammy ubuntu-noble centos-8 centos-9"
XPLAT_ARCHES="arm64 ppc64le s390x"
BINARY_API="https://apache.jfrog.io/artifactory"
ERLANGVERSION=${ERLANGVERSION:-26.2.5.11}
Expand Down Expand Up @@ -121,7 +121,6 @@ build-all-couch() {
( ${base} == "debian-bullseye" && ${arch} == "ppc64le" ) ||
( ${base} == "debian-bullseye" && ${arch} == "s390x") ||
( ${base} == "debian-bookworm" && ${arch} == "ppc64le" ) ||
( ${base} == "ubuntu-focal" && ${arch} == "ppc64le" ) ||
( ${base} == "ubuntu-jammy" && ${arch} == "ppc64le" ) ||
( ${base} == "ubuntu-noble" && ${arch} == "ppc64le" )
]]; then
Expand Down
5 changes: 0 additions & 5 deletions repo/conf/distributions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ Components: main
Architectures: amd64 arm64 ppc64el
Description: Official CouchDB Debian bookworm repository

Codename: focal
Components: main
Architectures: amd64 arm64 ppc64el
Description: Official CouchDB Ubuntu 20.04 focal repository

Codename: jammy
Components: main
Architectures: amd64 arm64 ppc64el
Expand Down