diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 819e3c73..76be54e4 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -62,11 +62,19 @@ jobs: run: | dir='${{ matrix.directory }}' img="perl:${dir//,/-}" + if [[ "$dir" != *"slim"* ]]; then + docker run "$img" cpanm -v Try::Tiny@0.30 + docker run "$img" cpanm -v Net::DNS@1.45_02 + fi docker run "$img" cpanm -v Mojolicious - name: Run cpm install test run: | dir='${{ matrix.directory }}' img="perl:${dir//,/-}" + if [[ "$dir" != *"slim"* ]]; then + docker run "$img" cpm install -v Try::Tiny@0.30 + docker run "$img" cpm install -v Net::DNS@1.45_02 + fi docker run "$img" cpm install -v Mojolicious - name: COPY all to default WORKDIR run: | diff --git a/generate.pl b/generate.pl index 4b4b2252..80e0984f 100755 --- a/generate.pl +++ b/generate.pl @@ -91,6 +91,7 @@ sub die_with_sample { url => "https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz", # sha256 taken from http://www.cpan.org/authors/id/M/MI/MIYAGAWA/CHECKSUMS sha256 => "963e63c6e1a8725ff2f624e9086396ae150db51dd0a337c3781d09a994af05a5", + patch => q[perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm], }, iosocketssl => { name => "IO-Socket-SSL-2.085", @@ -325,7 +326,9 @@ =head1 DESCRIPTION && cd /usr/src \ && curl -fLO {{cpanm_dist_url}} \ && echo '{{cpanm_dist_sha256}} *{{cpanm_dist_name}}.tar.gz' | sha256sum --strict --check - \ - && tar -xzf {{cpanm_dist_name}}.tar.gz && cd {{cpanm_dist_name}} && perl bin/cpanm . && cd /root \ + && tar -xzf {{cpanm_dist_name}}.tar.gz && cd {{cpanm_dist_name}} \ + && {{cpanm_dist_patch}} \ + && perl bin/cpanm . && cd /root \ && curl -fLO '{{netssleay_dist_url}}' \ && echo '{{netssleay_dist_sha256}} *{{netssleay_dist_name}}.tar.gz' | sha256sum --strict --check - \ && cpanm --from $PWD {{netssleay_dist_name}}.tar.gz \