Skip to content

Commit

Permalink
fixup apkAndTag.pl
Browse files Browse the repository at this point in the history
  • Loading branch information
tateisu committed Dec 31, 2024
1 parent ebe6bbc commit 035a7f5
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions apkAndTag.pl
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ ()
}

# Weblateの未マージのブランチがあるか調べる
sub checkweblateMerged(){
sub checkWeblateMerged(){
system qq(git fetch weblate -q);
my @list = `git branch -r --no-merged`;
for(@list){
Expand Down Expand Up @@ -581,18 +581,16 @@ ($)
cmd "./gradlew --stop";
cmd "rm -rf .gradle/caches/build-cache-*";
cmd "./gradlew clean";
cmd "./dependencyJson.pl";
cmd "./gradlew assembleNoFcmRelease";
cmd "./gradlew assembleFcmRelease";
cmd "./gradlew --stop";

cmd "mkdir -p _apk";

my $branchSanitided = sanitizeFileName($info->{branch});

for(
["fcm","app/build/outputs/apk/fcm/release/app-fcm-release.apk"],
["noFcm","app/build/outputs/apk/nofcm/release/app-nofcm-release.apk"],
["fcm", "app/build/outputs/apk/fcm/release/app-fcm-release.apk"],
["noFcm", "app/build/outputs/apk/nofcm/release/app-nofcm-release.apk"],
){
my($flavor,$srcPath)=@$_;
(-f $srcPath) or die "not found: $srcPath";
Expand Down Expand Up @@ -629,7 +627,7 @@ ($)
}elsif($action eq "tag"){
$branch eq 'main' or die "branch is not main. [$branch]";
checkWorkingTreeOrDie();
checkweblateMerged();
checkWeblateMerged();
dependencyJson();
checkWorkingTreeOrCommit();
apkGen($info);
Expand Down

0 comments on commit 035a7f5

Please sign in to comment.