[couchdb-pkg] 01/03: Default to Erlang 23 + Debian 11

[ko...@apache.org]

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

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

commit 6c69bb2ce7c157f55a255f4e4eee14e43774979f
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sun Feb 6 15:46:10 2022 -0500

    Default to Erlang 23 + Debian 11
---
 .travis.yml | 45 ---------------------------------------------
 build.sh    |  6 +++---
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ec4c330..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-dist: xenial
-
-language: minimal
-
-services:
-  - docker
-
-# Avoid double build on PRs (See https://github.com/travis-ci/travis-ci/issues/1147)
-branches:
-  only:
-    - master
-
-env:
-  global:
-    - ERLANGVERSION=20.3.8.25-1
-    - TARBALL_URL=https://dist.apache.org/repos/dist/release/couchdb/source/3.1.0/apache-couchdb-3.1.0.tar.gz
-    - TARBALL=apache-couchdb-3.1.0.tar.gz
-  matrix:
-    - TARGET="js debian-stretch"
-    - TARGET="couch debian-stretch ${TARBALL_URL}"
-    - TARGET="js debian-buster"
-    - TARGET="couch debian-buster ${TARBALL_URL}"
-    # Too slow, have to comment out...
-    #- TARGET="js arm64v8-debian-buster"
-    #- TARGET="couch arm64v8-debian-buster ${TARBALL_URL}"
-    - TARGET="js ubuntu-xenial"
-    - TARGET="couch ubuntu-xenial ${TARBALL_URL}"
-    - TARGET="js ubuntu-bionic"
-    - TARGET="couch ubuntu-bionic ${TARBALL_URL}"
-    - TARGET="js centos-6"
-    - TARGET="couch centos-6 ${TARBALL_URL}"
-    - TARGET="js centos-7"
-    - TARGET="couch centos-7 ${TARBALL_URL}"
-    - TARGET="js centos-8"
-    - TARGET="couch centos-8 ${TARBALL_URL}"
-
-before_install:
-  - docker --version
-  - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-
-script:
-  - ERLANGVERSION=${ERLANGVERSION} ./build.sh ${TARGET}
-
-after_script:
-  - ls -laR pkgs/
diff --git a/build.sh b/build.sh
index bbc9817..ac6cd37 100755
--- a/build.sh
+++ b/build.sh
@@ -31,10 +31,10 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DEBIANS="debian-stretch debian-buster debian-bullseye"
 UBUNTUS="ubuntu-bionic ubuntu-focal"
 CENTOSES="centos-7 centos-8"
-XPLAT_BASE="debian-buster"
+XPLAT_BASE="debian-bullseye"
 XPLAT_ARCHES="arm64v8 ppc64le"
 BINARY_API="https://apache.jfrog.io/artifactory"
-ERLANGVERSION=${ERLANGVERSION:-20.3.8.26-1}
+ERLANGVERSION=${ERLANGVERSION:-23.3.4.10}
 
 split-os-ver() {
   OLDIFS=$IFS
@@ -94,7 +94,7 @@ build-couch() {
     docker run \
         --mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
         -u 0 -w /home/jenkins/couchdb-pkg \
-        apache/couchdbci-${os}:${CONTAINERARCH}-${version}-erlang-${ERLANGVERSION} \
+        apache/couchdbci-${os}:${version}-erlang-${ERLANGVERSION} \
         make copy-couch ${CONTAINERARCH}-$1 COUCHTARBALL=${COUCHTARBALL}
   fi
   make clean