From 02f82c4fe05264540f102370b3f77a5b8304397d Mon Sep 17 00:00:00 2001
From: Tom Wyant <wyant@cpan.org>
Date: Wed, 31 Jan 2024 10:06:46 -0500
Subject: [PATCH] Revert "Try to sort out problems with GitHub CI."

This reverts commit 78aee39c77f67cf055060f5672229d22e8ad1bd3.
---
 .github/workflows/ci.yml         | 26 ++------------------------
 .github/workflows/environment.PL |  7 -------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00dc841..928faf7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,34 +84,12 @@ jobs:
         cpanm File::HomeDir Getopt::Long version
         perl .github/workflows/environment.PL
 
-    # The following two steps were inserted in an attempt tp figure out
-    # why MacOS could not install File::HomeDir. They can be removed once
-    # this is sorted out.
-
-    # The following technique from Gabor Szabo. Thanks:
-    # https://perlmaven.com/install-developer-dependencies-first-test-css
-    - name: Show cpanm install log under Unix
-      if: failure() && env.MY_IS_UNIX
-      run: cat $MY_HOME/.cpanm/work/*/build.log
-
-    - name: Show cpanm install log under Windows
-      if: failure() && env.MY_IS_WINDOWS
-      run: |
-        $dirs = Get-ChildItem "$env:MY_HOME\\.cpanm\\work\\"
-        foreach ( $d in $dirs ) {
-            $file = $d.FullName + "\\build.log"
-            echo ""
-            echo $file
-            type $file
-        }
-
     - name: Display local envoronment variables
       run: |
         echo MY_HOME=${{ env.MY_HOME }}
         echo MY_IS_GITHUB_ACTION=${{ env.MY_IS_GITHUB_ACTION }}
         echo MY_IS_UNIX=${{ env.MY_IS_UNIX }}
         echo MY_IS_WINDOWS=${{ env.MY_IS_WINDOWS }}
-        echo MY_MAKER=${{ env.MY_MAKER }}
         echo MY_WANT_POD_MAN=${{ env.MY_WANT_POD_MAN }}
 
     # Non-core toolchain Module::Build needs Pod::Man, which is in
@@ -133,8 +111,8 @@ jobs:
     - name: Run ExtUtils::MakeMaker tests
       run: |
         perl Makefile.PL
-        ${{ MY_MAKER }}
-        ${{ MY_MAKER }} test
+        make
+        make test
 
     - name: Run Module::Build tests
       run: |
diff --git a/.github/workflows/environment.PL b/.github/workflows/environment.PL
index d0b22ec..7422f5f 100644
--- a/.github/workflows/environment.PL
+++ b/.github/workflows/environment.PL
@@ -5,7 +5,6 @@ use 5.006002;
 use strict;
 use warnings;
 
-use Config;
 use File::HomeDir;
 use Getopt::Long;
 use version;
@@ -52,17 +51,11 @@ sub compute_environment {
         MY_IS_UNIX          => $is_unix,
         MY_IS_WINDOWS       => $is_windows,
         MY_WANT_POD_MAN     => want_pod_man(),
-        MY_MAKER            => $Config{make}
     );
 
     $is_windows
         and @env{ qw{ LINES COLUMNS } } = ( 24, 80 );
 
-    print <<"EOD";
-home=$ENV{HOME}
-make=$Config{make}
-EOD
-
     return \%env;
 }