25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00

Commit back, change reverted by mistake

This commit is contained in:
Paweł Chmielowski 2019-02-26 11:52:00 +01:00
parent b887133566
commit a40eb79cd0

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,6 +235,15 @@ 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 };
} }
} }
@ -252,12 +261,18 @@ 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);
} }
} }
} }
@ -431,10 +446,17 @@ 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;
push @deps_to_tag, $idx++, "Tag $dep with version $git_info->{$dep}->{new_tag}"; my $id = $idx++;
$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");