From 8e4b1238514cd625b7bdd38eee4d48f27d13a009 Mon Sep 17 00:00:00 2001
From: shawnlaffan <shawnlaffan@gmail.com>
Date: Mon, 4 Nov 2024 15:19:01 +1100
Subject: [PATCH] CI wrangling

update actions versions

shorten cpan build dir on windows

more system installs on mac
---
 .github/workflows/linux_de_locale.yml |  4 ++--
 .github/workflows/macos.yml           | 12 +++++++-----
 .github/workflows/windows.yml         | 15 ++++++++-------
 appveyor.yml                          |  2 ++
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/linux_de_locale.yml b/.github/workflows/linux_de_locale.yml
index ceb722fdd..c9f8ade11 100644
--- a/.github/workflows/linux_de_locale.yml
+++ b/.github/workflows/linux_de_locale.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       
       - uses: shogo82148/actions-setup-perl@v1
         with:
@@ -65,7 +65,7 @@ jobs:
           ls -l perlversion.txt
 
       - name: Cache CPAN modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/perl5
           key: ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 3ca41ffdb..cfca55391 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Perl
         run: |
@@ -34,9 +34,11 @@ jobs:
           which perl
           which cpanm
 
-      - name: Install GDAL and its deps
-        run: brew install --force --overwrite gdal
-        
+      - name: Install GDAL, its deps and some other stuff
+        run: |
+          brew install --force --overwrite gdal
+          brew install patchelf autoconf automake libtool
+
       - name: perl -V
         run: perl -V
 
@@ -47,7 +49,7 @@ jobs:
           ls -l perlversion.txt
 
       - name: Cache CPAN modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/perl5
           key: ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8ba917e6e..9db02360d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,13 +15,14 @@ env:
   PERL_MM_OPT: INSTALL_BASE=C:/cx
   #ALIEN_BUILD_PRELOAD: Fetch::Cache
   AUTOMATED_TESTING: 1
+  PERL_CPANM_HOME: c:\cpanm
 
 jobs:
   perl:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Perl
         run: |
@@ -51,7 +52,7 @@ jobs:
           dir perlversion.txt
 
       - name: Cache CPAN modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: c:\cx
           key: ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
@@ -65,7 +66,7 @@ jobs:
           dir aliencache.txt
 
       - name: Cache Alien downloads
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $HOMEPATH\.alienbuild
           key: ${{ runner.os }}-build-${{ hashFiles('aliencache.txt') }}
@@ -99,7 +100,7 @@ jobs:
         run: |
           echo $env:PATH
           cpanm --notest --installdeps Alien::sqlite
-          cpanm -v Alien::sqlite~1.05
+          cpanm -v Alien::sqlite
 
       - name: Install dependencies Alien::proj
         run: |
@@ -115,10 +116,10 @@ jobs:
       - name: Install dependencies Alien::gdal
         run: |
           cpanm --notest --installdeps Alien::gdal
-          echo "ALIEN_GDAL_CONFIG_ARGS=--with-hide_internal_symbols" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          #  echo "ALIEN_GDAL_CONFIG_ARGS=--with-hide_internal_symbols" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           #  qhull issues on gdal 3.5, maybe fixed in 3.6
-          $env:ALIEN_GDAL_CONFIG_ARGS = "--with-hide-internal-symbols=yes --without-gnm --without-qhull"
-          Get-PSDrive C | Select-Object Used,Free
+          #  $env:ALIEN_GDAL_CONFIG_ARGS = "--with-hide-internal-symbols=yes --without-gnm --without-qhull"
+          #  Get-PSDrive C | Select-Object Used,Free
           #  clunky path override
           #  $env:PATH = "C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;$env:PATH"
           cpanm -v Alien::gdal
diff --git a/appveyor.yml b/appveyor.yml
index 3f65c80b4..5210d298a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,6 +20,8 @@ install:
   #- ppm install --location http://biodiverse.unsw.edu.au/downloads/ppm PDL
   #- perl -MPDL -E"say 1"  #  check installation
   #- cpanm --notest --no-man-pages PDL
+  #  test issues https://github.com/tsee/extutils-cppguess/issues/30
+  - cpanm --notest ExtUtils::CppGuess
   
   #  aliens should be cached now
   - cpanm --quiet --notest Module::Compile