You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2022/05/05 17:58:20 UTC
[couchdb-pkg] branch update-erlang-23-version created (now 6ae57e7)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch update-erlang-23-version
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
at 6ae57e7 Update to handle Rocky Linux 8
This branch includes the following new commits:
new 4bfddfb Update Erlang to 23.3.4.14
new 6ae57e7 Update to handle Rocky Linux 8
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb-pkg] 01/02: Update Erlang to 23.3.4.14
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch update-erlang-23-version
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 4bfddfbc9e8827b94c695244f25906982f630f4d
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Thu May 5 01:03:35 2022 -0400
Update Erlang to 23.3.4.14
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index d749a4a..e04a20f 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ CENTOSES="centos-7 centos-8"
XPLAT_BASE="debian-bullseye"
XPLAT_ARCHES="arm64 ppc64le"
BINARY_API="https://apache.jfrog.io/artifactory"
-ERLANGVERSION=${ERLANGVERSION:-23.3.4.10}
+ERLANGVERSION=${ERLANGVERSION:-23.3.4.14}
split-os-ver() {
OLDIFS=$IFS
[couchdb-pkg] 02/02: Update to handle Rocky Linux 8
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch update-erlang-23-version
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 6ae57e706b8f79287f4d17b303eedd32d289afc3
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Thu May 5 13:53:55 2022 -0400
Update to handle Rocky Linux 8
---
bin/build-couchdb-pkg.sh | 2 +-
bin/build-js.sh | 2 +-
bin/detect-os.sh | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/build-couchdb-pkg.sh b/bin/build-couchdb-pkg.sh
index e7a30e8..bb54abf 100755
--- a/bin/build-couchdb-pkg.sh
+++ b/bin/build-couchdb-pkg.sh
@@ -28,7 +28,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. ${SCRIPTPATH}/detect-os.sh
-redhats='(rhel|centos|fedora)'
+redhats='(rhel|centos|fedora|rocky)'
debians='(debian|ubuntu)'
cd /home/jenkins
diff --git a/bin/build-js.sh b/bin/build-js.sh
index 36d6e33..5af965f 100755
--- a/bin/build-js.sh
+++ b/bin/build-js.sh
@@ -40,7 +40,7 @@ fi
cd ${SCRIPTPATH}/..
-redhats='(rhel|centos|fedora)'
+redhats='(rhel|centos|fedora|rocky)'
debians='(debian|ubuntu)'
if [[ ${ID} =~ ${redhats} ]]; then
# it will always place the build path at /root/rpmbuild :(
diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index 8359d24..a1c6a10 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -68,13 +68,17 @@ case "${OSTYPE}" in
# and finally some rough heuristics
if [[ -f /etc/redhat-release ]]; then
# /etc/redhat-release is so inconsistent, we use rpm instead
- rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
+ rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|rocky)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
if [[ $rhelish ]]; then
ID=${ID:-$(echo ${rhelish} | awk -F'-' '{print tolower($1)}')}
VERSION_ID=${VERSION_ID:-$(echo ${rhelish} | sed -E 's/([^[:digit:]]+)([[:digit:]]+)(.*)/\2/' )}
VERSION_CODENAME=${VERSION_CODENAME:-${VERSION_ID}}
DISTRIB_CODENAME=${VERSION_CODENAME:-${VERSION_ID}}
fi
+ # We expect VERSION_ID for RPM distros to be major version only (and as read
+ # from /etc/os-release it might not be) so we ensure that below
+ VERSION_ID=$(echo ${VERSION_ID} | cut -d. -f1)
+
elif [[ -f /etc/debian_version ]]; then
# Ubuntu keeps changing the format of /etc/os-release's VERSION, and
# it's numeric, not the codename. Boo.