diff options
| author | Oleksii Semilietov <[email protected]> | 2022-06-10 11:39:10 +0700 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2023-05-12 14:20:34 +0200 |
| commit | 3396e17fa89489e5a4f9a7744c9185102bdda821 (patch) | |
| tree | f2b7a7cccc70c4b70ecfbdceb18d24b412fa3dc6 /plugins/relx.mk | |
| parent | 9dcbdfed7f383fd69f1ea505ed165cc3e7714257 (diff) | |
| download | erlang.mk-3396e17fa89489e5a4f9a7744c9185102bdda821.tar.gz erlang.mk-3396e17fa89489e5a4f9a7744c9185102bdda821.tar.bz2 erlang.mk-3396e17fa89489e5a4f9a7744c9185102bdda821.zip | |
Fix compatibility with Relx v4 regarding {git, short} && {git, long}
Diffstat (limited to 'plugins/relx.mk')
| -rw-r--r-- | plugins/relx.mk | 8 |
1 files changed, 8 insertions, 0 deletions
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 |