浏览代码

chore(release): Add OTP_VERSION file to release dir

Zaiming Shi 5 年之前
父节点
当前提交
4fbc64d84e
共有 3 个文件被更改,包括 11 次插入7 次删除
  1. 1 0
      etc/BUILT_ON
  2. 2 3
      rebar.config
  3. 8 4
      rebar.config.erl

+ 1 - 0
etc/BUILT_ON

@@ -0,0 +1 @@
+{{built_on_arch}}

+ 2 - 3
rebar.config

@@ -28,9 +28,8 @@
 {cover_excl_mods, [emqx_exproto_pb, emqx_exhook_pb]}.
 {cover_excl_mods, [emqx_exproto_pb, emqx_exhook_pb]}.
 
 
 {provider_hooks,[{pre,[{release,{relup_helper,gen_appups}}]},
 {provider_hooks,[{pre,[{release,{relup_helper,gen_appups}}]},
-                 {post,[{release,{relup_helper,otp_vsn}},
-                 {release,{relup_helper,untar}}
-                ]}]}.
+                 {post,[{release,{relup_helper,untar}}]}
+                ]}.
 
 
 {post_hooks,[]}.
 {post_hooks,[]}.
 
 

+ 8 - 4
rebar.config.erl

@@ -65,24 +65,27 @@ relx(Profile) ->
 do_relx('emqx', Vsn) ->
 do_relx('emqx', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(cloud)}
     [ {release, {emqx, Vsn}, relx_apps(cloud)}
     , {overlay, relx_overlay(cloud)}
     , {overlay, relx_overlay(cloud)}
-    , {overlay_vars,["vars/vars-cloud.config","vars/vars-bin.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-cloud.config","vars/vars-bin.config"])}
     ];
     ];
 do_relx('emqx-pkg', Vsn) ->
 do_relx('emqx-pkg', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(cloud)}
     [ {release, {emqx, Vsn}, relx_apps(cloud)}
     , {overlay, relx_overlay(cloud)}
     , {overlay, relx_overlay(cloud)}
-    , {overlay_vars,["vars/vars-cloud.config","vars/vars-pkg.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-cloud.config","vars/vars-pkg.config"])}
     ];
     ];
 do_relx('emqx-edge', Vsn) ->
 do_relx('emqx-edge', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(edge)}
     [ {release, {emqx, Vsn}, relx_apps(edge)}
     , {overlay, relx_overlay(edge)}
     , {overlay, relx_overlay(edge)}
-    , {overlay_vars,["vars/vars-edge.config","vars/vars-bin.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-edge.config","vars/vars-bin.config"])}
     ];
     ];
 do_relx('emqx-edge-pkg', Vsn) ->
 do_relx('emqx-edge-pkg', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(edge)}
     [ {release, {emqx, Vsn}, relx_apps(edge)}
     , {overlay, relx_overlay(edge)}
     , {overlay, relx_overlay(edge)}
-    , {overlay_vars,["vars/vars-edge.config","vars/vars-pkg.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-edge.config","vars/vars-pkg.config"])}
     ].
     ].
 
 
+overlay_vars(Files) ->
+    [{built_on_arch, rebar_utils:get_arch()} | Files].
+
 relx_apps(ReleaseType) ->
 relx_apps(ReleaseType) ->
     [ kernel
     [ kernel
     , sasl
     , sasl
@@ -177,6 +180,7 @@ etc_overlay(ReleaseType) ->
                 lists:append([plugin_etc_overlays(App) || App <- PluginApps]),
                 lists:append([plugin_etc_overlays(App) || App <- PluginApps]),
     [ {mkdir, "etc/"}
     [ {mkdir, "etc/"}
     , {mkdir, "etc/plugins"}
     , {mkdir, "etc/plugins"}
+    , {template, "etc/BUILT_ON", "releases/{{release_version}}/BUILT_ON"}
     , {copy, "{{base_dir}}/lib/emqx/etc/certs","etc/"}
     , {copy, "{{base_dir}}/lib/emqx/etc/certs","etc/"}
     ] ++
     ] ++
     lists:map(
     lists:map(