From 3a7d7d3444b4d880c7b6785b244d9df057427987 Mon Sep 17 00:00:00 2001 From: Shoichi Kaji Date: Fri, 21 May 2021 07:48:54 +0900 Subject: [PATCH] cpmfile --- build/Dockerfile | 2 +- build/cpanfile | 4 ---- build/cpm.yml | 7 +++++++ build/github-actions.sh | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 build/cpanfile create mode 100644 build/cpm.yml diff --git a/build/Dockerfile b/build/Dockerfile index eb39697..e83a64e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -19,7 +19,7 @@ RUN mkdir -p \ /usr/local/lib64 RUN curl -fsSL https://git.io/perl-install | bash -s /perl RUN curl -fsSL --compressed -o /cpm https://git.io/cpm -COPY build/relocatable-perl-build build/cpanfile BUILD_VERSION / +COPY build/relocatable-perl-build build/cpm.yml BUILD_VERSION / RUN /perl/bin/perl /cpm install -g RUN /perl/bin/perl /relocatable-perl-build --perl_version $(cat /BUILD_VERSION) --prefix /opt/perl RUN /opt/perl/bin/perl /cpm install -g App::cpanminus App::ChangeShebang diff --git a/build/cpanfile b/build/cpanfile deleted file mode 100644 index 0a0cdaf..0000000 --- a/build/cpanfile +++ /dev/null @@ -1,4 +0,0 @@ -requires 'CPAN::Perl::Releases::MetaCPAN'; -requires 'Devel::PatchPerl'; -requires 'HTTP::Tinyish'; -requires 'IPC::Run3'; diff --git a/build/cpm.yml b/build/cpm.yml new file mode 100644 index 0000000..a066bef --- /dev/null +++ b/build/cpm.yml @@ -0,0 +1,7 @@ +prereqs: + runtime: + requires: + CPAN::Perl::Releases::MetaCPAN: + Devel::PatchPerl: + HTTP::Tinyish: + IPC::Run3: diff --git a/build/github-actions.sh b/build/github-actions.sh index 7f37dfc..07377a4 100644 --- a/build/github-actions.sh +++ b/build/github-actions.sh @@ -13,7 +13,7 @@ mac_build_perl() { export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin curl -fsSL https://git.io/perl-install | bash -s ~/perl curl -fsSL --compressed -o ~/cpm https://git.io/cpm - ~/perl/bin/perl ~/cpm install -g --cpanfile build/cpanfile + ~/perl/bin/perl ~/cpm install -g --cpmfile build/cpm.yml sudo install -m 755 -o $USER -g staff -d /opt/perl ~/perl/bin/perl build/relocatable-perl-build --prefix /opt/perl --perl_version $(cat BUILD_VERSION) /opt/perl/bin/perl ~/cpm install -g App::cpanminus App::ChangeShebang