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

Merge pull request #12097 from JimMoen/bump-oldest-otp-vsn-to-25

build: bump oldest otp vsn to OTP-25
JimMoen 2 лет назад
Родитель
Сommit
dfd143eff8
2 измененных файлов с 5 добавлено и 1 удалено
  1. 4 0
      .gitignore
  2. 1 1
      rebar.config.erl

+ 4 - 0
.gitignore

@@ -23,6 +23,8 @@ _build
 .rebar3
 .rebar3
 rebar3.crashdump
 rebar3.crashdump
 .DS_Store
 .DS_Store
+# emqx_ds_replication_layer_meta:ensure_site/0
+data
 etc/gen.emqx.conf
 etc/gen.emqx.conf
 compile_commands.json
 compile_commands.json
 cuttlefish
 cuttlefish
@@ -69,3 +71,5 @@ bom.json
 ct_run*/
 ct_run*/
 apps/emqx_conf/etc/emqx.conf.all.rendered*
 apps/emqx_conf/etc/emqx.conf.all.rendered*
 rebar-git-cache.tar
 rebar-git-cache.tar
+# build docker image locally
+.docker_image_tag

+ 1 - 1
rebar.config.erl

@@ -15,7 +15,7 @@ do(Dir, CONFIG) ->
     end.
     end.
 
 
 assert_otp() ->
 assert_otp() ->
-    Oldest = 24,
+    Oldest = 25,
     Latest = 26,
     Latest = 26,
     OtpRelease = list_to_integer(erlang:system_info(otp_release)),
     OtpRelease = list_to_integer(erlang:system_info(otp_release)),
     case OtpRelease < Oldest orelse OtpRelease > Latest of
     case OtpRelease < Oldest orelse OtpRelease > Latest of