Skip to content

Commit 952b34b

Browse files
committed
5.22.1 has been released
1 parent 0277d2e commit 952b34b

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/patchlevel.h b/patchlevel.h
2-
index a0ad78b..1812032 100644
2+
index bd56612..3d5f668 100644
33
--- a/patchlevel.h
44
+++ b/patchlevel.h
55
@@ -137,6 +137,7 @@ static const char * const local_patches[] = {
66
,"uncommitted-changes"
77
#endif
88
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
9-
+ ,"Devel::PatchPerl 1.34"
9+
+ ,"Devel::PatchPerl 1.38"
1010
,NULL
1111
};
1212

5.022.000-64bit,threaded/Dockerfile renamed to 5.022.001-64bit,threaded/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl
99
COPY *.patch /usr/src/perl/
1010
WORKDIR /usr/src/perl
1111

12-
RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2 -o perl-5.22.0.tar.bz2 \
13-
&& echo '400338c91c56420d98142cbfcb84d418cae2c98c *perl-5.22.0.tar.bz2' | sha1sum -c - \
14-
&& tar --strip-components=1 -xjf perl-5.22.0.tar.bz2 -C /usr/src/perl \
15-
&& rm perl-5.22.0.tar.bz2 \
12+
RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \
13+
&& echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \
14+
&& tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \
15+
&& rm perl-5.22.1.tar.bz2 \
1616
&& cat *.patch | patch -p1 \
1717
&& ./Configure -Dusethreads -Duse64bitall -des \
1818
&& make -j$(nproc) \
19-
&& make test_harness \
19+
&& TEST_JOBS=$(nproc) make test_harness \
2020
&& make install \
2121
&& cd /usr/src \
2222
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
@@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2
2626

2727
WORKDIR /root
2828

29-
CMD ["perl5.22.0","-de0"]
29+
CMD ["perl5.22.1","-de0"]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/patchlevel.h b/patchlevel.h
2-
index a0ad78b..1812032 100644
2+
index bd56612..3d5f668 100644
33
--- a/patchlevel.h
44
+++ b/patchlevel.h
55
@@ -137,6 +137,7 @@ static const char * const local_patches[] = {
66
,"uncommitted-changes"
77
#endif
88
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
9-
+ ,"Devel::PatchPerl 1.34"
9+
+ ,"Devel::PatchPerl 1.38"
1010
,NULL
1111
};
1212

5.022.000-64bit/Dockerfile renamed to 5.022.001-64bit/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl
99
COPY *.patch /usr/src/perl/
1010
WORKDIR /usr/src/perl
1111

12-
RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2 -o perl-5.22.0.tar.bz2 \
13-
&& echo '400338c91c56420d98142cbfcb84d418cae2c98c *perl-5.22.0.tar.bz2' | sha1sum -c - \
14-
&& tar --strip-components=1 -xjf perl-5.22.0.tar.bz2 -C /usr/src/perl \
15-
&& rm perl-5.22.0.tar.bz2 \
12+
RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \
13+
&& echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \
14+
&& tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \
15+
&& rm perl-5.22.1.tar.bz2 \
1616
&& cat *.patch | patch -p1 \
1717
&& ./Configure -Duse64bitall -des \
1818
&& make -j$(nproc) \
19-
&& make test_harness \
19+
&& TEST_JOBS=$(nproc) make test_harness \
2020
&& make install \
2121
&& cd /usr/src \
2222
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
@@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2
2626

2727
WORKDIR /root
2828

29-
CMD ["perl5.22.0","-de0"]
29+
CMD ["perl5.22.1","-de0"]

Releases.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ releases:
3939
sha1: eedf9e3be3c83bef15911996ed18703cffe4d113
4040
pause: SHAY
4141

42-
- version: 5.22.0
43-
sha1: 400338c91c56420d98142cbfcb84d418cae2c98c
44-
pause: RJBS
42+
- version: 5.22.1
43+
sha1: 29f9b320b0299577a3e1d02e9e8ef8f26f160332
44+
pause: SHAY

generate.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ sub die_with_sample {
8888

8989
for my $config (keys %builds) {
9090
my $output = $template;
91-
$output =~ s/{{$_}}/$release->{$_}/mg for (qw(version pause extra_flags sha1));
92-
$output =~ s/{{args}}/$builds{$config}/mg;
91+
$output =~ s/\{\{$_\}\}/$release->{$_}/mg for (qw(version pause extra_flags sha1));
92+
$output =~ s/\{\{args\}\}/$builds{$config}/mg;
9393

9494
my $dir = sprintf "%i.%03i.%03i-%s",
9595
($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/),
@@ -104,9 +104,9 @@ sub die_with_sample {
104104
}
105105

106106
if (defined $release->{test_parallel} && $release->{test_parallel} eq "no") {
107-
$output =~ s/{{test}}/make test_harness/;
107+
$output =~ s/\{\{test\}\}/make test_harness/;
108108
} elsif (!defined $release->{test_parallel} || $release->{test_parallel} eq "yes") {
109-
$output =~ s/{{test}}/TEST_JOBS=\$(nproc) make test_harness/;
109+
$output =~ s/\{\{test\}\}/TEST_JOBS=\$(nproc) make test_harness/;
110110
} else {
111111
die "test_parallel was provided for $release->{version} but is invalid; should be 'yes' or 'no'\n";
112112
}

0 commit comments

Comments
 (0)