Merge pull request #50 from kiela/master

Make erlware_commons be compatible with Erlang 17.0-rc1
2014-02-19 13:42:26 +01:00 · 2014-02-19 13:42:26 +01:00 · b125ce055e
commit b125ce055e
parent 96cdc0e623 741bba1b82
2 changed files with 6 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,5 +1,10 @@
 language: erlang
 otp_release:
+       - 17.0-rc1
+       - R16B03-1
+       - R16B03
+       - R16B02
+       - R16B01
       - R16B
       - R15B02
       - R15B01
--- a/rebar.config.script
+++ b/rebar.config.script
@ -13,7 +13,7 @@ MergeConfig = fun({Key, ToAdd}, C) ->
                      end
              end.

-{match, [ErtsNumber]} = re:run(erlang:system_info(otp_release), "R(\\d+).+", [{capture, [1], list}]),
+{match, [ErtsNumber]} = re:run(erlang:system_info(otp_release), "(\\d+)", [{capture, [0], list}]),
 ErtsVsn = erlang:list_to_integer(ErtsNumber),
 AddErlOpts = if
                 ErtsVsn >= 15 ->