simplify PDLPorters ci-dist

Author: mohawk2

github-actions/ci-dist/action.yml

@@ -147,45 +147,35 @@ runs:
   steps:
     # Target: none
     # Shared step to do initial set up
-    - name: initial setup
+    - name: set SYSTEM_CORES (Linux)
       shell: bash
-      run: |
-          echo "::group::initial setup"
-          export SYSTEM_CORES=1;
-          if ${{ toJSON( runner.os == 'Linux' ) }}; then
-            export SYSTEM_CORES="$(grep -c ^processor /proc/cpuinfo 2>/dev/null || echo 1 )"
-          elif ${{ toJSON( runner.os == 'macOS' ) }}; then
-            export SYSTEM_CORES="$(sysctl -n hw.ncpu || echo 1)"
-          elif ${{ toJSON( runner.os == 'Windows' ) }}; then
-            export SYSTEM_CORES=$( powershell -NoProfile -Command "& { Get-WmiObject Win32_Processor | Select-Object -Property NumberOfCores }" | perl -0777 -ne 'print $1, "\n" while /(\d+)/g' );
-          fi
-          echo "SYSTEM_CORES=$SYSTEM_CORES" >> $GITHUB_ENV
-          if ${{ toJSON(
-                 fromJSON(inputs.build-enable-parallel || 'true')
-              ) }}; then
-            echo "MAKEFLAGS=-j$(( SYSTEM_CORES + 1))" >> $GITHUB_ENV
-          fi
-
-          #if ${{ toJSON( runner.os == 'Windows' ) }}; then
-          #  # Set TEMP to full path instead of 8.3 short filenames.
-          #  # See <https://github.com/actions/virtual-environments/issues/712>.
-          #  # $USERPROFILE\\AppData\\Local\\Temp
-          #  [ -d 'C:\tmp' ] || mkdir 'C:\tmp';
-          #  echo 'TMP=C:\tmp' >> $GITHUB_ENV
-          #  echo 'TEMP=C:\tmp' >> $GITHUB_ENV
-          #fi
+      if: runner.os == 'Linux'
+      run: echo SYSTEM_CORES="$(grep -c ^processor /proc/cpuinfo 2>/dev/null || echo 1 )" >> $GITHUB_ENV
+    - name: set SYSTEM_CORES (macOS)
+      shell: bash
+      if: runner.os == 'macOS'
+      run: echo SYSTEM_CORES="$(sysctl -n hw.ncpu || echo 1)" >> $GITHUB_ENV
+    - name: set SYSTEM_CORES (Windows)
+      shell: bash
+      if: runner.os == 'Windows'
+      run: echo SYSTEM_CORES=$( powershell -NoProfile -Command "& { Get-WmiObject Win32_Processor | Select-Object -Property NumberOfCores }" | perl -0777 -ne 'print $1, "\n" while /(\d+)/g' ) >> $GITHUB_ENV
+    - name: set MAKEFLAGS
+      shell: bash
+      if: inputs.build-enable-parallel
+      run: echo "MAKEFLAGS=-j$(( SYSTEM_CORES + 1))" >> $GITHUB_ENV
 
-          # This is needed for Clang 12 due to
-          # <https://github.com/Perl/perl5/issues/18780>.
-          if ${{ toJSON( runner.os == 'macOS' ) }}; then
-            PATCH_EUMM_DIR=$HOME/build_aux
-            [ -d $PATCH_EUMM_DIR ] || mkdir $PATCH_EUMM_DIR
-            if [ ! -f $PATCH_EUMM_DIR/clang12_no_warnings.pm ]; then
-              echo 'package clang12_no_warnings; use ExtUtils::MakeMaker::Config; $Config{ccflags} = join " ", $Config{ccflags}, "-Wno-compound-token-split-by-macro"; 1;' > $PATCH_EUMM_DIR/clang12_no_warnings.pm
-              echo "PERL5OPT=${PERL5OPT:+${PERL5OPT} }-I$PATCH_EUMM_DIR -Mclang12_no_warnings" >> $GITHUB_ENV
-            fi
-          fi
-          echo "::endgroup::"
+    - name: Suppress Clang 12+ compiler spew
+      shell: bash
+      if: runner.os == 'macOS'
+      run: |
+        # This is needed for Clang 12 due to
+        # <https://github.com/Perl/perl5/issues/18780>.
+        PATCH_EUMM_DIR=$HOME/build_aux
+        [ -d $PATCH_EUMM_DIR ] || mkdir $PATCH_EUMM_DIR
+        if [ ! -f $PATCH_EUMM_DIR/clang12_no_warnings.pm ]; then
+          echo 'package clang12_no_warnings; use ExtUtils::MakeMaker::Config; $Config{ccflags} = join " ", $Config{ccflags}, "-Wno-compound-token-split-by-macro"; 1;' > $PATCH_EUMM_DIR/clang12_no_warnings.pm
+          echo "PERL5OPT=${PERL5OPT:+${PERL5OPT} }-I$PATCH_EUMM_DIR -Mclang12_no_warnings" >> $GITHUB_ENV
+        fi
     # Shared step for setting up graphical display.
     - name: Set up graphical display
       shell: bash
@@ -373,44 +363,28 @@ runs:
         choco install --verbose make
     - name: target-test (no coverage)
       shell: bash
+      if: ${{ (inputs.target-all || inputs.target-test) && !inputs.test-enable-coverage }}
       env:
         AUTOMATED_TESTING: 1
         HARNESS_OPTIONS: ${{ inputs.test-harness-options }}
       run: |
-          if ${{ toJSON(
-                (  fromJSON(inputs.target-all)
-                || fromJSON(inputs.target-test)
-                )
-                && ! fromJSON(inputs.test-enable-coverage || 'false')
-              ) }}; then
-            echo "::group::test (no coverage)"
-            cd ${{ inputs.path }}
-            if [ -f Makefile.PL ]; then
-              ( $TEST_RUNNER_PREFIX make && $TEST_RUNNER_PREFIX make test ) || exit 1
-            elif [ -f Build.PL ]; then
-              ( $TEST_RUNNER_PREFIX $MYPERL Build test ) || exit 1
-            else
-              echo "No file Makefile.PL or Build.PL" >&2
-            fi
-            echo "::endgroup::"
-          fi
+        cd ${{ inputs.path }}
+        if [ -f Makefile.PL ]; then
+          ( $TEST_RUNNER_PREFIX make && $TEST_RUNNER_PREFIX make test ) || exit 1
+        elif [ -f Build.PL ]; then
+          ( $TEST_RUNNER_PREFIX $MYPERL Build test ) || exit 1
+        else
+          echo "No file Makefile.PL or Build.PL" >&2
+        fi
     - name: target-test (with coverage)
       shell: bash
+      if: ${{ (inputs.target-all || inputs.target-test) && inputs.test-enable-coverage }}
       env:
         AUTOMATED_TESTING: 1
         HARNESS_OPTIONS: ${{ inputs.test-harness-options }}
         GITHUB_TOKEN: ${{ inputs.github-token }}
       run: |
-          if ${{ toJSON(
-                (  fromJSON(inputs.target-all)
-                || fromJSON(inputs.target-test)
-                )
-                && fromJSON(inputs.test-enable-coverage || 'false')
-              ) }}; then
-            echo "::group::test (with coverage)"
-            cd ${{ inputs.path }}
-            $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
+        cd ${{ inputs.path }}
+        $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