Просмотр исходного кода

avoid R15B and R15B01

merl depends on changes in erl_syntax introduced in R15B02: https://github.com/erlang/otp/commit/53746070b5de7d1e9f809d516648948b0a246561
Andreas Stenius 11 лет назад
Родитель
Сommit
7e0923bda1
2 измененных файлов с 2 добавлено и 4 удалено
  1. 0 2
      .travis.yml
  2. 2 2
      rebar.config

+ 0 - 2
.travis.yml

@@ -11,8 +11,6 @@ otp_release:
 #  - R15B03-1 not available on travis
   - R15B03
   - R15B02
-  - R15B01
-  - R15B
 
 # since Travis is naughty and calls rebar get-deps behind our backs,
 # we'll have to clean it up and build merl our selves..

+ 2 - 2
rebar.config

@@ -1,8 +1,8 @@
 %% -*- mode: erlang -*-
 
-%% accept any R15B, any R16B except R16B03
+%% accept R15B02.., any R16B except R16B03
 %% also accept OTP v17, altough it may not work properly on that release yet..
-{require_otp_vsn, "R15B|R16B$|R16B[^0]|R16B0[^3]|R16B03-1|17"}.
+{require_otp_vsn, "R15B0[^1]|R16B$|R16B[^0]|R16B0[^3]|R16B03-1|17"}.
 
 {erl_opts, [debug_info]}.
 {yrl_opts, [{includefile, "include/erlydtl_preparser.hrl"}]}.