From bf96ba9875ba2205677e6d9e4ac23e3e225f1ec0 Mon Sep 17 00:00:00 2001 From: Kamil Kieliszczyk Date: Wed, 19 Feb 2014 10:39:30 +0100 Subject: Add R16B03, R16B03-1 and 17.0-rc1 to .travis.yml --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b12a1c..9833c26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: erlang otp_release: + - 17.0-rc1 + - R16B03-1 + - R16B03 - R16B02 - R16B01 - R16B @@ -21,4 +24,4 @@ notifications: channels: - "irc.freenode.org#erlware" use_notice: true - skip_join: true \ No newline at end of file + skip_join: true -- cgit v1.2.3 From ba757e5a00b30eb89309e0fdc1cfbd02b1b32324 Mon Sep 17 00:00:00 2001 From: Kamil Kieliszczyk Date: Wed, 19 Feb 2014 12:27:10 +0100 Subject: Make relx be compatible with Erlang 17.0-rc1 --- rebar.config.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config.script b/rebar.config.script index c19a751..819fc7b 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -1,4 +1,4 @@ -{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), Opts1 = case lists:keysearch(erl_opts, 1, CONFIG) of {value, {erl_opts, Opts0}} -> -- cgit v1.2.3