diff --git a/rebar.config b/rebar.config index 5b0190ed8..963c2a86b 100644 --- a/rebar.config +++ b/rebar.config @@ -19,31 +19,31 @@ %%%---------------------------------------------------------------------- {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"}}}, - {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.17"}}}, - {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", "6e5dc474dfcf617c1299cc55cc8e292f33a8f865"}}, - {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.14"}}}, - {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.34"}}}, - {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.3.0"}}}, - {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.17"}}}, + {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.18"}}}, + {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.0"}}}, + {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.15"}}}, + {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.35"}}}, + {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.3.2"}}}, + {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.18"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, - {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}}, - {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.0"}}}, + {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.4"}}}, + {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.1"}}}, {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"}}}, - {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.26"}}}}, - {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.27"}}}}, + {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.28"}}}}, {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", - {tag, "1.1.6"}}}}, + {tag, "1.1.7"}}}}, {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {tag, "1.1.6"}}}}, {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", - {tag, "1.0.4"}}}}, + {tag, "1.0.5"}}}}, {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client", {tag, {if_version_above, "19", "develop", "2.5.3"}}}}}, %% Elixir support, needed to run tests diff --git a/tools/update-deps-releases.pl b/tools/update-deps-releases.pl index 17358d975..9458c9da2 100755 --- a/tools/update-deps-releases.pl +++ b/tools/update-deps-releases.pl @@ -169,7 +169,7 @@ sub update_app_src { my $app = ".deps-update/$dep/src/$dep.app.src"; return if not -f $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); } @@ -235,15 +235,6 @@ sub deps_git_info { my $new_tag = $last_tag; $new_tag =~ s/(\d+)$/$1+1/e; 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 }; } } @@ -261,18 +252,12 @@ sub show_commands { say color("red"), $_, color("reset"), ") $commands{$_}"; } ReadMode(4); - my $wkey = ""; while (1) { my $key = ReadKey(0); - $wkey = substr($wkey.$key, -2); if (defined $commands{uc($key)}) { ReadMode(0); say ""; 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 @od; 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) { next unless @{$git_info->{$dep}->{new_commits}}; $od[$idx] = $dep; - my $id = $idx++; - $id = sprintf "%02d", $id if $count > 9; - push @deps_to_tag, $id, "Tag $dep with version $git_info->{$dep}->{new_tag}"; + push @deps_to_tag, $idx++, "Tag $dep with version $git_info->{$dep}->{new_tag}"; } last if $idx == 1; my $cmd = show_commands(@deps_to_tag, E => "Exit");