1
0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-09 16:48:47 +01:00

trunkからmainにブランチを変更したのでチェックスクリプトも変更。mainブランチへのコミットを禁止する

This commit is contained in:
tateisu 2021-07-03 23:26:12 +09:00
parent c01cfdf954
commit 28318d650e

View File

@ -9,6 +9,7 @@ use utf8;
binmode $_ for \*STDOUT,\*STDERR; binmode $_ for \*STDOUT,\*STDERR;
my $preCommit = grep{ $_ eq '--pre-commit'} @ARGV;
sub cmd($){ sub cmd($){
print "+ ",$_[0],"\n"; print "+ ",$_[0],"\n";
@ -38,8 +39,10 @@ while(<$fh>){
}elsif( /^##\s*(\S+?)(?:\.\.|$)/ ){ }elsif( /^##\s*(\S+?)(?:\.\.|$)/ ){
my $branch=$1; my $branch=$1;
print "# branch=$branch\n"; print "# branch=$branch\n";
$branch eq 'trunk' if($preCommit){
or warn "!!!! current branch is not trunk !!!!\n"; # mainブランチに直接コミットすることはなくなった
$branch eq 'main' and warn "!!!! current branch is main. Direct commits and pushes are prohibited. !!!!\n";
}
# }else{ # }else{
# warn "working tree is not clean.\n"; # warn "working tree is not clean.\n";
# cmd "git status"; # cmd "git status";
@ -77,6 +80,7 @@ for my $file(@files){
}else{ }else{
$lang=$default_name; $lang=$default_name;
} }
my $data = $xml->XMLin($file); my $data = $xml->XMLin($file);
if( not $data->{string} or ($data->{string}{content} and not ref $data->{string}{content} )){ if( not $data->{string} or ($data->{string}{content} and not ref $data->{string}{content} )){
warn "?? please make at least 2 string entries in $file\n"; warn "?? please make at least 2 string entries in $file\n";
@ -114,6 +118,7 @@ for my $lang ( sort keys %langs ){
if(not $master->{$name} ){ if(not $master->{$name} ){
$missing{$name} =1; $missing{$name} =1;
} }
my @params = $value =~ /(%\d+\$[\d\.]*[sdxf])/g; my @params = $value =~ /(%\d+\$[\d\.]*[sdxf])/g;
my $params = join ',', sort @params; my $params = join ',', sort @params;
my $master_params = $params{$name} // ''; my $master_params = $params{$name} // '';