Rework development installations

pjcj · Apr 26, 2024 · f47649c · f47649c
1 parent 3b30336
commit f47649c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/utils/all_versions b/utils/all_versions
@@ -183,6 +183,7 @@ sub main {
     my $perl = "dc-$v";
     (my $c = $command) =~ s/=perl/$perl/g;
     # print "Running [$c] from $v\n";
+    $ENV{PLENV_VERSION} = $perl;
     # $c =~ s/=v/$v/g;
     if ($c =~ /^make /) {
       sys "rm -rf t/e2e";

diff --git a/utils/dc b/utils/dc
@@ -147,27 +147,43 @@ main() {
     ;;
   install_dependencies)
     cpanm --notest App::cpm
-    if command -v plenv >/dev/null 2>&1; then
-      plenv rehash
-    fi
-    cpm install --workers="$("$0" nice_cpus)" --global \
+    plenv rehash
+    local cpm
+    cpm="$(plenv which cpm)"
+    $cpm install --workers="$("$0" nice_cpus)" --global \
       Sereal Digest::MD5 Template Pod::Coverage::CountParents \
       Capture::Tiny Parallel::Iterator Template Class::XSAccessor \
       Moo namespace::clean CPAN::Releases::Latest JSON::MaybeXS \
       CPAN::DistnameInfo HTML::Entities
     ;;
   install_development_dependencies)
     cpanm --notest App::cpm
-    if command -v plenv >/dev/null 2>&1; then
-      plenv rehash
-    fi
-    cpm install --workers="$("$0" nice_cpus)" --global \
-      Perl::Critic Perl::Tidy Dist::Zilla
+    plenv rehash
+    local cpm
+    cpm="$(plenv which cpm)"
+    $cpm install --workers="$("$0" nice_cpus)" --global \
+      Dist::Zilla Perl::Critic Perl::Tidy
+    plenv rehash
     dzil authordeps --missing |
       xargs cpm install --workers="$("$0" nice_cpus)" --global
     dzil listdeps --missing |
       xargs cpm install --workers="$("$0" nice_cpus)" --global
     ;;
+  install_perl)
+    name="${2:?No name specified}"
+    version="${3:?No version specified}"
+    yes | plenv uninstall "$name" || true
+    plenv install --as "$name" -j 32 -D usedevel --noman "$version"
+    PLENV_VERSION="$name" plenv install-cpanm
+    PLENV_VERSION="$name" dc install_dependencies
+    ;;
+  install_cpancover_perl)
+    dc install_perl cpancover "$2"
+    ;;
+  install_dc_dev_perl)
+    dc install_perl dc-dev "$2"
+    PLENV_VERSION=dc-dev dc install_development_dependencies
+    ;;
   nice_cpus)
     perl -Iutils -MDevel::Cover::BuildUtils=nice_cpus \
       -e "print nice_cpus"
@@ -176,21 +192,6 @@ main() {
     shift
     ./utils/all_versions "$@"
     ;;
-  install_cpancover_perl)
-    version="${2:?No version specified}"
-    yes | plenv uninstall cpancover || true
-    plenv install --as cpancover -j 32 -D usedevel --noman "$version"
-    PLENV_VERSION=cpancover plenv install-cpanm
-    PLENV_VERSION=cpancover dc install_dependencies
-    ;;
-  install_dc_perl)
-    version="${2:?No version specified}"
-    yes | plenv uninstall dc || true
-    plenv install --as dc -j 32 -D usedevel --noman "$version"
-    PLENV_VERSION=dc plenv install-cpanm
-    PLENV_VERSION=dc dc install_dependencies
-    PLENV_VERSION=dc dc install_development_dependencies
-    ;;
   cpancover)
     shift
     jobs=$("$0" nice_cpus)