You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/01/14 01:57:24 UTC
[couchdb-ci] branch update-debian-pr-images created (now 467f4ff)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch update-debian-pr-images
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git.
at 467f4ff Simplify Debian 11 support
This branch includes the following new commits:
new e7fc47c Bump patch releases, add Erlang 24
new 25abec3 Use new FDB URLs, update to 6.3.23
new 30b39ee Default to current Debian Stable for erlang:all
new 467f4ff Simplify Debian 11 support
The 4 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-ci] 04/04: Simplify Debian 11 support
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch update-debian-pr-images
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 467f4ff1be04482663cca65d572c0c0f1256b787
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Thu Jan 13 20:52:51 2022 -0500
Simplify Debian 11 support
When we first introduced support for Bullseye we added some logic to
handle Erlang 19 and below. We no longer support those obsolete
versions, and the logic we added is now actively harmful (e.g. the use
of gcc 9 instead of gcc 10 caused us to build Erlang 24 without the
much-anticipated JIT compiler).
This patch reverts back to defaults for Bullseye. It has the side effect
of causing Erlang 20 builds to fail to link properly, possibly because
of the switch to `-fno-common` by default in gcc 10. Given that Erlang
20 is already unsupported by the Erlang team, I didn't bother to try to
fix it here.
---
bin/source-erlang.sh | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/bin/source-erlang.sh b/bin/source-erlang.sh
index 2c24386..0914cf6 100755
--- a/bin/source-erlang.sh
+++ b/bin/source-erlang.sh
@@ -40,33 +40,17 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
redhats='(rhel|centos|fedora)'
debians='(debian|ubuntu)'
-latest='(stretch|buster|bionic)'
echo "Erlang source build started @ $(date)"
-export CC=gcc
-export CXX=gcc
-
# Install per-distro dependencies according to:
# http://docs.basho.com/riak/1.3.0/tutorials/installation/Installing-Erlang/
# NB: Dropping suggested superfluous packages; fop and unixodbc-dev
if [[ ${ID} =~ ${redhats} ]]; then
yum install -y git gcc glibc-devel make ncurses-devel openssl-devel autoconf procps
elif [[ ${ID} =~ ${debians} ]]; then
- if [[ ${ERLANGVERSION%%.*} -le 19 ]] && [[ ${VERSION_CODENAME} =~ ${latest} ]] && [ ${ERLANGVERSION} != "all" ]; then
- echo "Recent versions of Linux (Stretch, Bionic, etc) provide a version of libssl"
- echo "which is too new to complile earlier (<=19) versions of Erlang. Please"
- echo "either choose an earlier distro release or a more rencent version of Erlang."
- exit 1
- fi
-
apt-get update
apt-get install -y git build-essential autoconf libncurses5-dev openssl libssl-dev xsltproc procps
- if [ ${VERSION_CODENAME} == "bullseye" ]; then
- apt install -y gcc-9
- export CC=gcc-9
- export CXX=g++-9
- fi
else
echo "Sorry, we don't support this Linux (${ID}) yet."
exit 1
@@ -105,9 +89,10 @@ else
cd otp
git checkout OTP-${ERLANGVERSION} -b local-OTP-${ERLANGVERSION}
- # Configure Erlang - skip building things we don't want or need
+ # This command is a no-op as of Erlang 22
./otp_build autoconf
+ # Configure Erlang - skip building things we don't want or need
./otp_build configure --without-javac --without-wx --without-odbc \
--without-debugger --without-observer --without-et --without-cosEvent \
--without-cosEventDomain --without-cosFileTransfer \
@@ -126,7 +111,4 @@ elif [[ ${ID} =~ ${debians} ]]; then
apt-get clean
fi
-unset CC
-unset CXX
-
echo "Erlang source build finished @ $(date)"
[couchdb-ci] 02/04: Use new FDB URLs, update to 6.3.23
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch update-debian-pr-images
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 25abec3625a4f0cccd0e686f684db5953ba660b2
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Jan 12 16:46:17 2022 -0500
Use new FDB URLs, update to 6.3.23
---
bin/apt-dependencies.sh | 6 +++---
bin/yum-dependencies.sh | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index 345d1c8..ca9cd0e 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -200,8 +200,8 @@ fi
# FoundationDB - but only for amd64 right now!!!!
# TODO: fix for ppc64le and s390x - get IBM to help build these packages maybe?
if [ "${ARCH}" == "x86_64" ]; then
- wget https://www.foundationdb.org/downloads/6.3.9/ubuntu/installers/foundationdb-clients_6.3.9-1_amd64.deb
- wget https://www.foundationdb.org/downloads/6.3.9/ubuntu/installers/foundationdb-server_6.3.9-1_amd64.deb
+ wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb
+ wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-server_6.3.23-1_amd64.deb
dpkg -i ./foundationdb*deb
pkill -f fdb || true
pkill -f foundation || true
@@ -209,7 +209,7 @@ if [ "${ARCH}" == "x86_64" ]; then
else
apt install --no-install-recommends -y cmake mono-devel ninja-build libboost-all-dev liblz4-dev dos2unix fakeroot liblz4-1
git clone https://github.com/apple/foundationdb/
- cd foundationdb && git checkout 6.3.9
+ cd foundationdb && git checkout 6.3.23
git apply /root/couchdb-ci/files/no-bintray.patch || true
mkdir .build && cd .build
if [ "${ARCH}" == "ppc64le" ]; then
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index d651f85..2886cd8 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -194,12 +194,12 @@ fi
# FoundationDB
if [[ ${VERSION_ID} -eq 6 ]]; then
- wget https://www.foundationdb.org/downloads/6.3.9/rhel6/installers/foundationdb-clients-6.3.9-1.el6.x86_64.rpm
- wget https://www.foundationdb.org/downloads/6.3.9/rhel6/installers/foundationdb-server-6.3.9-1.el6.x86_64.rpm
+ wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients-6.3.23-1.el6.x86_64.rpm
+ wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-server-6.3.23-1.el6.x86_64.rpm
yum --nogpgcheck localinstall -y foundationdb*rpm
else
- wget https://www.foundationdb.org/downloads/6.3.9/rhel7/installers/foundationdb-clients-6.3.9-1.el7.x86_64.rpm
- wget https://www.foundationdb.org/downloads/6.3.9/rhel7/installers/foundationdb-server-6.3.9-1.el7.x86_64.rpm
+ wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients-6.3.23-1.el7.x86_64.rpm
+ wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-server-6.3.23-1.el7.x86_64.rpm
# Buggy FoundationDB packages require this workaround
rpm -i --nodeps ./foundationdb*rpm
fi
[couchdb-ci] 01/04: Bump patch releases, add Erlang 24
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch update-debian-pr-images
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit e7fc47c3df60da6c7a9df525abb91fd83d08a14b
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Jan 12 16:41:21 2022 -0500
Bump patch releases, add Erlang 24
---
dockerfiles/debian-bullseye | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dockerfiles/debian-bullseye b/dockerfiles/debian-bullseye
index 5a109d7..690b2eb 100644
--- a/dockerfiles/debian-bullseye
+++ b/dockerfiles/debian-bullseye
@@ -28,7 +28,7 @@ ARG js=js
ARG erlang=erlang
# Select version of Node, Erlang and Elixir
ARG erlangversion=20.3.8.26-1
-ARG kerlversions=20.3.8.26,21.3.8.22,22.3.4.17,23.3.1
+ARG kerlversions=20.3.8.26,21.3.8.24,22.3.4.24,23.3.4.10,24.2
ARG elixirversion=v1.9.4
ARG nodeversion=14
[couchdb-ci] 03/04: Default to current Debian Stable for erlang:all
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch update-debian-pr-images
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 30b39ee3b3777957ff0447722f67df7eab13872f
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Jan 12 16:46:38 2022 -0500
Default to current Debian Stable for erlang:all
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 23749f4..d45d979 100755
--- a/build.sh
+++ b/build.sh
@@ -45,7 +45,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DEBIANS="debian-stretch debian-buster debian-bullseye"
UBUNTUS="ubuntu-xenial ubuntu-bionic ubuntu-focal"
CENTOSES="centos-7 centos-8"
-ERLANGALL_BASE="debian-buster"
+ERLANGALL_BASE="debian-bullseye"
XPLAT_BASE="debian-buster"
# XPLAT_ARCHES="arm64v8 ppc64le"
XPLAT_ARCHES="arm64v8"