ci-dist update from PDLPorters

Author: mohawk2

github-actions/ci-dist/action.yml

@@ -199,7 +199,7 @@ runs:
               ) }}; then
             if ${{ toJSON( runner.os == 'Linux' ) }}; then
               echo "::group::Install xvfb (via apt-get)"
-              sudo apt-get install xvfb
+              sudo apt-get install --no-install-recommends -y xvfb
               mkdir /tmp/runtime-runner && chmod 0700 /tmp/runtime-runner
               echo "XDG_RUNTIME_DIR=/tmp/runtime-runner" >> $GITHUB_ENV
               if ${{ fromJSON(inputs.build-enable-graphical-display || 'false') }}; then
@@ -257,7 +257,7 @@ runs:
                 )
       uses: actions/cache@v4
       with:
-        key: locallib-v2.${{ inputs.perl-deps-cache-version }}-${{ runner.os }}-${{ env.GHA_CACHE_PERL_V_HASH }}
+        key: locallib-v2.${{ inputs.perl-deps-cache-version }}-${{ runner.os }}-${{ inputs.perl-version }}-${{ env.GHA_CACHE_PERL_V_HASH }}
         path: ~/perl5
     - name: target-setup-perl (ccache)
       # ccache support on Windows is not well-tested
@@ -284,8 +284,8 @@ runs:
               ) }}; then
             echo "::group::setup-perl (setup local::lib)"
             # older Perls need this upgrade
-            $MYPERL -S cpanm -n --local-lib=~/perl5 ExtUtils::MakeMaker
-            $MYPERL -S cpanm -n --local-lib=~/perl5 local::lib
+            $MYPERL -S cpanm -n --local-lib=~/perl5 ExtUtils::MakeMaker || ( cat ~/.cpanm/build.log && false )
+            $MYPERL -S cpanm -n --local-lib=~/perl5 local::lib || ( cat ~/.cpanm/build.log && false )
             LOCALLIB_VARS="$($MYPERL -I ~/perl5/lib/perl5 -Mlocal::lib=--shelltype,bourne )"
             eval $( echo "$LOCALLIB_VARS" | $MYPERL -MFile::Spec -pne '
               $_ = "" if /^PATH=/;
@@ -334,8 +334,8 @@ runs:
               ) }}; then
             echo "::group::test-release-testing (via cpanm)"
             cd ${{ inputs.path }}
-            $BUILD_RUNNER_PREFIX $MYPERL -S cpanm -n --installdeps --with-develop . || cat ~/.cpanm/build.log
-            $BUILD_RUNNER_PREFIX $MYPERL -S cpanm -n CPAN::Changes || cat ~/.cpanm/build.log
+            $BUILD_RUNNER_PREFIX $MYPERL -S cpanm -n --installdeps --with-develop . || ( cat ~/.cpanm/build.log && false )
+            $BUILD_RUNNER_PREFIX $MYPERL -S cpanm -n CPAN::Changes || ( cat ~/.cpanm/build.log && false )
             if [ -d xt ]; then
               $TEST_RUNNER_PREFIX $MYPERL -S prove -lr xt
             else
@@ -366,11 +366,14 @@ runs:
             fi
             echo "::endgroup::"
           fi
-    - name: GNU make for Windows
+    - name: set MYMAKE (Windows)
       shell: bash
-      if: ${{ matrix.os == 'windows-latest' }}
-      run: |
-        choco install --verbose make
+      if: runner.os == 'Windows'
+      run: echo MYMAKE=gmake >> $GITHUB_ENV
+    - name: set MYMAKE (non-Windows)
+      shell: bash
+      if: runner.os != 'Windows'
+      run: echo MYMAKE=make >> $GITHUB_ENV
     - name: target-test (no coverage)
       shell: bash
       env:
@@ -388,7 +391,7 @@ runs:
             if [ -f Makefile.PL ]; then
               ( $TEST_RUNNER_PREFIX make && $TEST_RUNNER_PREFIX make test ) || exit 1
             elif [ -f Build.PL ]; then
-              ( $TEST_RUNNER_PREFIX ./Build test ) || exit 1
+              ( $TEST_RUNNER_PREFIX $MYPERL Build test ) || exit 1
             else
               echo "No file Makefile.PL or Build.PL" >&2
             fi
@@ -409,8 +412,8 @@ runs:
               ) }}; then
             echo "::group::test (with coverage)"
             cd ${{ inputs.path }}
-            $MYPERL -S cpanm -n Devel::Cover::Report::Coveralls || cat ~/.cpanm/build.log
-            $MYPERL -S cpanm -n git://github.com/PDLPorters/Devel--Cover.git@patches || cat ~/.cpanm/build.log
+            $MYPERL -S cpanm -n Devel::Cover::Report::Coveralls || ( cat ~/.cpanm/build.log && false )
+            $MYPERL -S cpanm -n https://github.com/PDLPorters/Devel--Cover.git@patches || ( cat ~/.cpanm/build.log && false )
             $TEST_RUNNER_PREFIX $MYPERL -S cover -test -relative_only -gcov_chdir -report Coveralls
             echo "::endgroup::"
           fi