Skip to content

Commit 9d8cf8b

Browse files
committed
Tidy
1 parent 546882e commit 9d8cf8b

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

bin/build_all.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
);
3232
my %aliases_rev;
3333

34-
my %multi_platform = map {$_ => 1} qw( noble plucky questing );
34+
my %multi_platform = map { $_ => 1 } qw( noble plucky questing );
3535

3636
while (my ($alias, $name) = each %aliases) {
3737
$aliases_rev{$name} ||= [];
@@ -51,7 +51,7 @@
5151
$tags .= " --tag movabletype/test:$t";
5252
}
5353
my $dockerfile = path("$name/Dockerfile")->slurp;
54-
my ($from) = $dockerfile =~ /^FROM (\S+)/;
54+
my ($from) = $dockerfile =~ /^FROM (\S+)/;
5555
system("docker pull $from") if $no_cache;
5656
if ($builder && $multi_platform{$name}) {
5757
system("docker buildx build --builder $builder --platform linux/amd64,linux/arm64 $name $tags --output=type=image" . ($no_cache ? " --no-cache" : "") . ($push ? " --push" : "") . " 2>&1 | tee log/build_$name.log");

bin/test_readme.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
$line =~ s/(?:MariaDB|Postgres) //;
2727
my ($image, $base, @rest) = split '\|', $line;
2828
next if $image =~ /(?:openldap|chromedriver)/;
29+
2930
if ($image =~ /(?:addons|chromiumdriver|playwright)/) {
3031
my @extra = split /,\s*/, $rest[0];
3132
$mapping{$image} = { map { split / /, $_ } @extra };

bin/test_workflows.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use File::Path;
66

77
my $local = YAML::LoadFile('./.github/workflows/mirror.yml');
8-
my %tags = map {$_ => 1} @{$local->{jobs}{'pull-and-push'}{strategy}{matrix}{tag} // []};
9-
$tags{centos6} = 1; # special case
8+
my %tags = map { $_ => 1 } @{ $local->{jobs}{'pull-and-push'}{strategy}{matrix}{tag} // [] };
9+
$tags{centos6} = 1; # special case
1010

1111
my @branches = qw(develop support-8.8.x support-8.4.x support-8.0.x);
1212
my @repos = qw(movabletype movabletype-addons movabletype-plugins);
@@ -23,7 +23,7 @@
2323
next;
2424
}
2525
my $workflow = YAML::LoadFile($yml);
26-
for my $key (keys %{$workflow->{jobs}}) {
26+
for my $key (keys %{ $workflow->{jobs} }) {
2727
if (my $image = $workflow->{jobs}{$key}{env}{TEST_IMAGE_NAME}) {
2828
ok $tags{$image}, "$image is used in $repo/$branch (by env)";
2929
$used{$image}{$branch} = 1;

0 commit comments

Comments
 (0)