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 ed295bf Remove Ubuntu Focal
ed295bf is described below
commit ed295bf0438bc95ade59ef37d8da0caac66e6851
Author: Nick Vatamaniuc <[email protected]>
AuthorDate: Thu Jun 19 23:12:44 2025 -0400
Remove Ubuntu Focal
---
Makefile | 37 -------------------------------------
build.sh | 5 ++---
repo/conf/distributions | 5 -----
3 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/Makefile b/Makefile
index 6acd950..658003a 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/build.sh b/build.sh
index 936a628..9c65d02 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 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}
@@ -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
diff --git a/repo/conf/distributions b/repo/conf/distributions
index 817d119..b019225 100644
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -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
