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/02/07 14:36:56 UTC
[couchdb-pkg] branch 3.2.1 created (now d59bd6c)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch 3.2.1
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.
at d59bd6c Update package metadata
This branch includes the following new commits:
new 6c69bb2 Default to Erlang 23 + Debian 11
new ac4e680 Use --platform to select container arch at runtime
new d59bd6c Update package metadata
The 3 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] 03/03: Update package metadata
Posted by 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 d59bd6cca5dcddb2959b9539a9ae2af4fde3aba5
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Feb 7 09:35:56 2022 -0500
Update package metadata
---
Makefile | 7 +++++--
rpm/SPECS/couchdb.spec.in | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d000a56..add825f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,10 @@
# the License.
COUCHDIR=../couchdb
-DEBCHANGELOG="Automatically generated package from upstream."
+DEBCHANGELOG="Bump to Erlang 23"
+
+# Define DEBVERSION to append a package version to the upstream CouchDB version
+DEBVERSION="1"
JS_DEBCHANGELOG="Automatically generated package from couchdb-ci repository."
JS_VERSION=1.8.5-1.0.0+couch-2
@@ -186,7 +189,7 @@ copy-debian:
cp -R debian $(DISTDIR)
update-changelog:
- cd $(DISTDIR) && dch -v $(VERSION)~$(PLATFORM) $(DEBCHANGELOG)
+ cd $(DISTDIR) && dch -v $(VERSION)-$(DEBVERSION)~$(PLATFORM) $(DEBCHANGELOG)
dpkg:
cd $(DISTDIR) && dpkg-buildpackage -b -us -uc
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index bbb611c..85a5a41 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -18,7 +18,7 @@ Summary: RESTful document oriented database
License: Apache License v2.0
Name: %{name}
Version: %{_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: https://www.apache.org/dist/couchdb/source/${version}/apache-couchdb-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.init
[couchdb-pkg] 01/03: Default to Erlang 23 + Debian 11
Posted by 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
[couchdb-pkg] 02/03: Use --platform to select container arch at runtime
Posted by 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 ac4e680468488e48929bbdd340ea700692788419
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Feb 7 09:32:49 2022 -0500
Use --platform to select container arch at runtime
The bugs seem to have been worked out here, so we can use multi-platform
container images like the ones we've generated for CI and still select
the runtime architecture we want if we need to build packages via QEMU.
---
Makefile | 1 +
build.sh | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8366e15..d000a56 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,7 @@ debian-bullseye: SPIDERMONKEY_DEV=libmozjs-78-dev
debian-bullseye: SM_VER=78
debian-bullseye: bullseye
+arm64-debian-bullseye: aarch64-debian-bullseye
arm64v8-debian-bullseye: aarch64-debian-bullseye
aarch64-debian-bullseye: PLATFORM=bullseye
aarch64-debian-bullseye: DIST=debian-bullseye
diff --git a/build.sh b/build.sh
index ac6cd37..1a4aaf4 100755
--- a/build.sh
+++ b/build.sh
@@ -32,7 +32,7 @@ DEBIANS="debian-stretch debian-buster debian-bullseye"
UBUNTUS="ubuntu-bionic ubuntu-focal"
CENTOSES="centos-7 centos-8"
XPLAT_BASE="debian-bullseye"
-XPLAT_ARCHES="arm64v8 ppc64le"
+XPLAT_ARCHES="arm64 ppc64le"
BINARY_API="https://apache.jfrog.io/artifactory"
ERLANGVERSION=${ERLANGVERSION:-23.3.4.10}
@@ -88,12 +88,14 @@ build-couch() {
docker run \
--mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
-u 0 -w /home/jenkins/couchdb-pkg \
+ --platform linux/amd64 \
apache/couchdbci-${os}:${version}-erlang-${ERLANGVERSION} \
make copy-couch $1 COUCHTARBALL=${COUCHTARBALL}
else
docker run \
--mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
-u 0 -w /home/jenkins/couchdb-pkg \
+ --platform linux/${CONTAINERARCH} \
apache/couchdbci-${os}:${version}-erlang-${ERLANGVERSION} \
make copy-couch ${CONTAINERARCH}-$1 COUCHTARBALL=${COUCHTARBALL}
fi