From 3396e17fa89489e5a4f9a7744c9185102bdda821 Mon Sep 17 00:00:00 2001 From: Oleksii Semilietov Date: Fri, 10 Jun 2022 11:39:10 +0700 Subject: Fix compatibility with Relx v4 regarding {git, short} && {git, long} --- plugins/relx.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/relx.mk b/plugins/relx.mk index 5683013..d9515a4 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -37,6 +37,8 @@ define relx_release.erl {cmd, Cmd} -> os:cmd(Cmd); semver -> ""; {semver, _} -> ""; + {git, short} -> string:trim(os:cmd("git rev-parse --short HEAD"), both, "\n"); + {git, long} -> string:trim(os:cmd("git rev-parse HEAD"), both, "\n"); VsnStr -> Vsn0 end, {ok, _} = relx:build_release(#{name => Name, vsn => Vsn}, Config), @@ -50,6 +52,8 @@ define relx_tar.erl {cmd, Cmd} -> os:cmd(Cmd); semver -> ""; {semver, _} -> ""; + {git, short} -> string:trim(os:cmd("git rev-parse --short HEAD"), both, "\n"); + {git, long} -> string:trim(os:cmd("git rev-parse HEAD"), both, "\n"); VsnStr -> Vsn0 end, {ok, _} = relx:build_tar(#{name => Name, vsn => Vsn}, Config), @@ -63,6 +67,8 @@ define relx_relup.erl {cmd, Cmd} -> os:cmd(Cmd); semver -> ""; {semver, _} -> ""; + {git, short} -> string:trim(os:cmd("git rev-parse --short HEAD"), both, "\n"); + {git, long} -> string:trim(os:cmd("git rev-parse HEAD"), both, "\n"); VsnStr -> Vsn0 end, {ok, _} = relx:build_relup(Name, Vsn, undefined, Config ++ [{output_dir, "$(RELX_OUTPUT_DIR)"}]), @@ -104,6 +110,8 @@ define get_relx_release.erl {cmd, Cmd} -> os:cmd(Cmd); semver -> ""; {semver, _} -> ""; + {git, short} -> string:trim(os:cmd("git rev-parse --short HEAD"), both, "\n"); + {git, long} -> string:trim(os:cmd("git rev-parse HEAD"), both, "\n"); VsnStr -> Vsn0 end, Extended = case lists:keyfind(extended_start_script, 1, Config) of -- cgit v1.2.3