25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Update deps

This commit is contained in:
Paweł Chmielowski 2019-02-26 10:31:50 +01:00
parent 65b94ae9c8
commit daf9c99728
2 changed files with 18 additions and 40 deletions

View File

@ -19,31 +19,31 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
{deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager", "3.6.7"}}, {deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager", "3.6.7"}},
{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.13"}}}, {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.14"}}},
{cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.17"}}}, {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.18"}}},
{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", "6e5dc474dfcf617c1299cc55cc8e292f33a8f865"}}, {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.0"}}},
{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.14"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.15"}}},
{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.34"}}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.35"}}},
{xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.3.0"}}}, {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.3.2"}}},
{fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.17"}}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.18"}}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
{p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.4"}}},
{pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.0"}}}, {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.1"}}},
{jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.8.4"}}}, {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.8.4"}}},
{eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.9"}}}, {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.10"}}},
{mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.1"}}}, {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.1"}}},
{if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.26"}}}}, {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.27"}}}},
{if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.27"}}}}, {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.28"}}}},
{if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
{tag, "1.0.8"}}}}, {tag, "1.0.9"}}}},
{if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
{tag, "1.1.6"}}}}, {tag, "1.1.7"}}}},
{if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
{tag, "1.1.6"}}}}, {tag, "1.1.6"}}}},
{if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam", {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam",
{tag, "1.0.4"}}}}, {tag, "1.0.5"}}}},
{if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib", {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
{tag, "1.0.4"}}}}, {tag, "1.0.5"}}}},
{if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client", {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client",
{tag, {if_version_above, "19", "develop", "2.5.3"}}}}}, {tag, {if_version_above, "19", "develop", "2.5.3"}}}}},
%% Elixir support, needed to run tests %% Elixir support, needed to run tests

View File

@ -169,7 +169,7 @@ sub update_app_src {
my $app = ".deps-update/$dep/src/$dep.app.src"; my $app = ".deps-update/$dep/src/$dep.app.src";
return if not -f $app; return if not -f $app;
my $content = slurp($app); my $content = slurp($app);
$content =~ s/(\{\s*vsn\s*,\s*)".*"/$1"$version"/; $content =~ s/({\s*vsn\s*,\s*)".*"/$1"$version"/;
write_file($app, $content); write_file($app, $content);
} }
@ -235,15 +235,6 @@ sub deps_git_info {
my $new_tag = $last_tag; my $new_tag = $last_tag;
$new_tag =~ s/(\d+)$/$1+1/e; $new_tag =~ s/(\d+)$/$1+1/e;
chomp(@new); chomp(@new);
my $cl = ".deps-update/$dep/CHANGELOG.md";
my $content = slurp($cl, err_mode => "quiet") // "";
if ($content =~ /^# Version (\S+)/) {
if (!grep({$_ eq $1} @tags) && $1 ne $new_tag) {
$new_tag = $1;
}
}
$info{$dep} = { last_tag => $last_tag, new_commits => \@new, new_tag => $new_tag }; $info{$dep} = { last_tag => $last_tag, new_commits => \@new, new_tag => $new_tag };
} }
} }
@ -261,18 +252,12 @@ sub show_commands {
say color("red"), $_, color("reset"), ") $commands{$_}"; say color("red"), $_, color("reset"), ") $commands{$_}";
} }
ReadMode(4); ReadMode(4);
my $wkey = "";
while (1) { while (1) {
my $key = ReadKey(0); my $key = ReadKey(0);
$wkey = substr($wkey.$key, -2);
if (defined $commands{uc($key)}) { if (defined $commands{uc($key)}) {
ReadMode(0); ReadMode(0);
say ""; say "";
return uc($key); return uc($key);
} elsif (defined $commands{uc($wkey)}) {
ReadMode(0);
say "";
return uc($wkey);
} }
} }
} }
@ -446,17 +431,10 @@ while (1) {
my @deps_to_tag; my @deps_to_tag;
my @od; my @od;
my $idx = 1; my $idx = 1;
my $count = 0;
for my $dep (sort keys %$top_deps) {
next unless @{$git_info->{$dep}->{new_commits}};
$count++;
}
for my $dep (sort keys %$top_deps) { for my $dep (sort keys %$top_deps) {
next unless @{$git_info->{$dep}->{new_commits}}; next unless @{$git_info->{$dep}->{new_commits}};
$od[$idx] = $dep; $od[$idx] = $dep;
my $id = $idx++; push @deps_to_tag, $idx++, "Tag $dep with version $git_info->{$dep}->{new_tag}";
$id = sprintf "%02d", $id if $count > 9;
push @deps_to_tag, $id, "Tag $dep with version $git_info->{$dep}->{new_tag}";
} }
last if $idx == 1; last if $idx == 1;
my $cmd = show_commands(@deps_to_tag, E => "Exit"); my $cmd = show_commands(@deps_to_tag, E => "Exit");