diff options
| author | Nick Vatamaniuc <vatamane@apache.org> | 2019-07-09 16:45:52 -0400 |
|---|---|---|
| committer | Nick Vatamaniuc <vatamane@apache.org> | 2019-07-09 21:42:28 -0400 |
| commit | 61fc0868699805733a8f4357783bcdd06629d708 (patch) | |
| tree | 6a508429ccd44be70b936e75e25e7b5daec1b637 | |
| parent | e92384067738446759e22021340eb6b24be10d16 (diff) | |
| download | couchdb-erlang-22-support.tar.gz | |
Add erlang 22 supporterlang-22-support
Bumped elixir version to 1.7.4 as 1.6.6 wasn't built with Erlang 22
support.
Also moving straight to 22.0.5 since 22.0 in travis crashed with a
segmentation fault. Some of the release comments in the point release
mention VM crashes, so it seems to check out.
Fixes https://github.com/apache/couchdb/issues/2069
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | rebar.config.script | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f75dd0454..7ef4aeadf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: elixir -elixir: 1.6.6 +elixir: 1.7.4 os: linux dist: trusty otp_release: + - 22.0.5 - 21.2.3 - 20.3.8.5 - 19.3 diff --git a/rebar.config.script b/rebar.config.script index 33ceb7283..6445057e7 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -44,6 +44,8 @@ case VerList of [20 | _] = V20 when V20 >= [20, 3, 8, 11] -> ok; [21, 2] -> NotSupported(VerString); [21, 2, N | _] when N < 3 -> NotSupported(VerString); + [22, 0] -> NotSupported(VerString); + [22, 0, N | _] when N < 5 -> NotSupported(VerString); _ -> ok end. @@ -98,7 +100,7 @@ DepDescs = [ {b64url, "b64url", {tag, "1.0.1"}}, {ets_lru, "ets-lru", {tag, "1.0.0"}}, {khash, "khash", {tag, "1.0.1"}}, -{snappy, "snappy", {tag, "CouchDB-1.0.2"}}, +{snappy, "snappy", {tag, "CouchDB-1.0.4"}}, {ioq, "ioq", {tag, "2.1.2"}}, {hqueue, "hqueue", {tag, "1.0.1"}}, {smoosh, "smoosh", {tag, "1.0.1"}}, @@ -148,7 +150,7 @@ ErlOpts = case os:getenv("ERL_OPTS") of end, AddConfig = [ - {require_otp_vsn, "19|20|21"}, + {require_otp_vsn, "19|20|21|22"}, {deps_dir, "src"}, {deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)}, {sub_dirs, SubDirs}, |