summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2018-06-21 16:28:56 -0500
committerNick Vatamaniuc <nickva@users.noreply.github.com>2018-10-04 12:30:48 -0400
commitbe6de6f32d0be7147dce8ebe39dd54c07d7be31f (patch)
treeddf4ba1b72fcc237a6e7b78817c78c4902642e5d
parent436e5f0d29ab399d6e14a4c531bfa35336591d41 (diff)
downloadcouchdb-be6de6f32d0be7147dce8ebe39dd54c07d7be31f.tar.gz
Update rebar.config.script and travis CI
Fixes #1396
-rw-r--r--.travis.yml1
-rw-r--r--rebar.config.script4
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index acb0b5102..01b2862a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
os: linux
otp_release:
+ - 21.1
- 20.3
- 19.3
- 18.3
diff --git a/rebar.config.script b/rebar.config.script
index 22dde7cde..3bb1a584c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -65,7 +65,7 @@ DepDescs = [
{hyper, "hyper", {tag, "CouchDB-2.2.0-4"}},
{ibrowse, "ibrowse", {tag, "CouchDB-4.0.1"}},
{jiffy, "jiffy", {tag, "CouchDB-0.14.11-2"}},
-{mochiweb, "mochiweb", {tag, "v2.17.0"}},
+{mochiweb, "mochiweb", {tag, "CouchDB-v2.18.0-1"}},
{meck, "meck", {tag, "0.8.8"}}
],
@@ -91,7 +91,7 @@ ErlOpts = case os:getenv("ERL_OPTS") of
end,
AddConfig = [
- {require_otp_vsn, "17|18|19|20"},
+ {require_otp_vsn, "17|18|19|20|21"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs)},
{sub_dirs, SubDirs},