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 2024/05/15 18:27:11 UTC
(couchdb) branch jenkins-update-repos-and-reqs updated (7c77bc36e -> 83a9e04f0)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch jenkins-update-repos-and-reqs
in repository https://gitbox.apache.org/repos/asf/couchdb.git
discard 7c77bc36e Update a few deps and improve CI
new 83a9e04f0 Update a few deps and improve CI
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7c77bc36e)
\
N -- N -- N refs/heads/jenkins-update-repos-and-reqs (83a9e04f0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
src/mango/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(couchdb) 01/01: Update a few deps and improve CI
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch jenkins-update-repos-and-reqs
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 83a9e04f0d21f1b85db7bd0b7c0063dd5b620302
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed May 15 13:11:32 2024 -0400
Update a few deps and improve CI
Some dependencies were held back due to older CentOS and Ubuntu, now we can
update them.
Try to replace CentOS7 with CentOS9 in the full CI and use the "no spidermonkey
whatsoever" CI variant as well.
---
build-aux/Jenkinsfile.full | 41 ++++++++++++++++++++++++++++++++++-------
src/docs/requirements.txt | 2 +-
src/mango/requirements.txt | 7 +++----
3 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 6a3414c75..2eb57d95b 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -31,6 +31,14 @@ meta = [
image: "apache/couchdbci-centos:8-erlang-${ERLANG_VERSION}"
],
+ 'centos9': [
+ name: 'CentOS 9',
+ spidermonkey_vsn: '78',
+ enable_nouveau: true,
+ enable_clouseau: true,
+ image: "apache/couchdbci-centos:9-erlang-${ERLANG_VERSION}"
+ ],
+
'focal': [
name: 'Ubuntu 20.04',
spidermonkey_vsn: '68',
@@ -80,6 +88,14 @@ meta = [
image: "apache/couchdbci-debian:bookworm-erlang-${ERLANG_VERSION}"
],
+ 'bookworm-quickjs': [
+ name: 'Debian 12 with QuickJS',
+ disable_spidermonkey: true,
+ enable_nouveau: true,
+ enable_clouseau: true,
+ image: "apache/couchdbci-debian:bookworm-erlang-${ERLANG_VERSION}"
+ ],
+
'freebsd-x86_64': [
name: 'FreeBSD',
spidermonkey_vsn: '91',
@@ -106,7 +122,11 @@ meta = [
]
def String configure(config) {
- result = "./configure --skip-deps --spidermonkey-version ${config.spidermonkey_vsn}"
+ if (config.disable_spidermonkey) {
+ result = "./configure --skip-deps --disable-spidermonkey"
+ } else {
+ result = "./configure --skip-deps --spidermonkey-version ${config.spidermonkey_vsn}"
+ }
if (config.enable_nouveau) {
result += " --enable-nouveau"
}
@@ -359,24 +379,31 @@ pipeline {
unstash 'tarball'
unarchive mapping: ['pkgs/' : '.']
- sh( label: 'Build Debian repo', script: '''
- mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el8 $BRANCH_NAME/source
+ sh( label: 'Setup repo dirs', script: '''
+ mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el8 $BRANCH_NAME/el9 $BRANCH_NAME/source
git clone https://github.com/apache/couchdb-pkg
- for plat in bullseye focal
+ ''' )
+
+ sh( label: 'Build Debian repo', script: '''
+ for plat in bullseye bookworm focal
do
reprepro -b couchdb-pkg/repo includedeb $plat pkgs/$plat/*.deb
done
''' )
- sh( label: 'Build CentOS repos', script: '''
- #cp js/centos-8/*rpm pkgs/centos8
- cd pkgs/centos8 && createrepo_c --database .
+ sh( label: 'Build CentOS 8', script: '''
+ (cd pkgs/centos8 && createrepo_c --database .)
+ ''' )
+
+ sh( label: 'Build CentOS 9', script: '''
+ (cd pkgs/centos9 && createrepo_c --database .)
''' )
sh( label: 'Build unified repo', script: '''
mv couchdb-pkg/repo/pool $BRANCH_NAME/debian
mv couchdb-pkg/repo/dists $BRANCH_NAME/debian
mv pkgs/centos8/* $BRANCH_NAME/el8
+ mv pkgs/centos9/* $BRANCH_NAME/el9
mv apache-couchdb-*.tar.gz $BRANCH_NAME/source
cd $BRANCH_NAME/source
ls -1tr | head -n -10 | xargs -d '\n' rm -f --
diff --git a/src/docs/requirements.txt b/src/docs/requirements.txt
index de04c55ce..51305f9a5 100644
--- a/src/docs/requirements.txt
+++ b/src/docs/requirements.txt
@@ -1,4 +1,4 @@
-Sphinx==7.2.6
+Sphinx==7.3.7
sphinx-rtd-theme==2.0.0
sphinxcontrib-httpdomain==1.8.1
sphinxcontrib-jquery==4.1
diff --git a/src/mango/requirements.txt b/src/mango/requirements.txt
index e63cbdde7..5a6554a0a 100644
--- a/src/mango/requirements.txt
+++ b/src/mango/requirements.txt
@@ -1,5 +1,4 @@
-nose2==0.11.0
-# requests 2.27.1 is the highest supported version
-# on ubuntu 18 and centos 7 CI workers
+# nose2 0.13.0 is a minimum version for python on centos8
+nose2==0.13.0
requests==2.27.1
-hypothesis==6.31.6
+hypothesis==6.102.4