File tree Expand file tree Collapse file tree 6 files changed +23
-23
lines changed Expand file tree Collapse file tree 6 files changed +23
-23
lines changed Original file line number Diff line number Diff line change 11diff --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
Original file line number Diff line number Diff line change @@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl
99COPY *.patch /usr/src/perl/
1010WORKDIR /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
2727WORKDIR /root
2828
29- CMD ["perl5.22.0 " ,"-de0" ]
29+ CMD ["perl5.22.1 " ,"-de0" ]
Original file line number Diff line number Diff line change 11diff --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
Original file line number Diff line number Diff line change @@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl
99COPY *.patch /usr/src/perl/
1010WORKDIR /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
2727WORKDIR /root
2828
29- CMD ["perl5.22.0 " ,"-de0" ]
29+ CMD ["perl5.22.1 " ,"-de0" ]
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments