summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <wohali@users.noreply.github.com>2020-09-11 18:37:00 -0400
committerJoan Touzet <joant@atypical.net>2020-09-15 11:59:37 -0400
commit3feaccf0b95391a8ab58f2897d2ee6dad26bea2a (patch)
treea973dc940a338fa90b43d683e84b1fbf139e41a2
parent45f6989a13dc92b98194bc0ad204a79f03e684c9 (diff)
downloadcouchdb-3feaccf0b95391a8ab58f2897d2ee6dad26bea2a.tar.gz
Prep for 3.1.1-RC2 (#3148)
-rw-r--r--.gitignore1
-rw-r--r--build-aux/Jenkinsfile.full7
-rw-r--r--rebar.config.script2
3 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5411c5dd1..d76b7cbb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.o
+*.asc
*.sha256
*.sha512
*.snap
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 440359f5d..7da3f419c 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -180,7 +180,7 @@ pipeline {
./configure --with-curl --spidermonkey-version 60
make check || (build-aux/logfile-uploader.py && false)
- # No package build for macOS at this time because of notarization
+ # No package build for macOS at this time
'''
} // withEnv
} // steps
@@ -593,6 +593,10 @@ pipeline {
} // post
} // stage
+/*
+
+ - Removed 2020.09.15 - VMs are offline
+
stage('Debian Buster ppc64le') {
agent {
docker {
@@ -636,6 +640,7 @@ pipeline {
}
} // post
} // stage
+*/
/*
* Example of how to do a qemu-based run, please leave here
diff --git a/rebar.config.script b/rebar.config.script
index e48a559ac..1ffbf70b0 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -151,7 +151,7 @@ DepDescs = [
%% Non-Erlang deps
{docs, {url, "https://github.com/apache/couchdb-documentation"},
- {tag, "3.1.1-RC1"}, [raw]},
+ {tag, "3.1.1-RC2"}, [raw]},
{fauxton, {url, "https://github.com/apache/couchdb-fauxton"},
{tag, "v1.2.6"}, [raw]},
%% Third party deps