summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <joant@atypical.net>2020-10-07 18:25:22 -0400
committerJoan Touzet <joant@atypical.net>2020-10-07 18:25:22 -0400
commit250eb27ddc6c3c434f57ae662bb66f6d23132f30 (patch)
treed8761f1a358e1ccc0069569e658dfb38b6944780
parent6b23f20bd70b933988ebeb888cb6d39b308f8742 (diff)
downloadcouchdb-minor-ci-fixups.tar.gz
Fixes to CI process for main branchminor-ci-fixups
-rw-r--r--README.rst4
-rw-r--r--build-aux/Jenkinsfile.pr2
2 files changed, 3 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index c527913b5..bce039d8c 100644
--- a/README.rst
+++ b/README.rst
@@ -5,8 +5,8 @@ Apache CouchDB README
| |1| |
+-----+
-.. |1| image:: https://ci-couchdb.apache.org/job/jenkins-cm1/job/FullPlatformMatrix/job/master/badge/icon?subject=master%20build
- :target: https://ci-couchdb.apache.org/blue/organizations/jenkins/jenkins-cm1%2FFullPlatformMatrix/activity?branch=master
+.. |1| image:: https://ci-couchdb.apache.org/job/jenkins-cm1/job/FullPlatformMatrix/job/main/badge/icon?subject=main%20build
+ :target: https://ci-couchdb.apache.org/blue/organizations/jenkins/jenkins-cm1%2FFullPlatformMatrix/activity?branch=main
Installation
------------
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 114dfd849..001fd59ca 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -21,7 +21,7 @@ cd build
tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
cd apache-couchdb-*
. /usr/local/kerl/${KERL_VER}/activate
-./configure
+./configure --spidermonkey-version 60
make check || (make build-report && false)
'''