CI: more caching

ajolma · Jun 11, 2024 · 3716b1c · 3716b1c
1 parent 4ca4f16
commit 3716b1c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/linux_bin_build.yml b/.github/workflows/linux_bin_build.yml
@@ -9,11 +9,7 @@ on:
   pull_request:
 
 env:
-  PERL5LIB: /home/runner/perl5/lib
-  PERL_LOCAL_LIB_ROOT: /home/runner/perl5/lib
-  PERL_MB_OPT: --install_base /home/runner/perl5/
-  PERL_MM_OPT: INSTALL_BASE=/home/runner/perl5/
-  AUTOMATED_TESTING: 1
+  PERL_MOD_DIR: /home/runner/perl5/lib/perl5
 
 
 jobs:
@@ -40,8 +36,8 @@ jobs:
       - name: Prepare for CPAN cache
         run: |
           perl -V > perlversion.txt
-          echo '20220320a' >> perlversion.txt
-          dir perlversion.txt
+          # echo '20220320a' >> perlversion.txt
+          # dir perlversion.txt
 
       - name: Cache CPAN modules
         uses: actions/cache@v4
@@ -62,7 +58,7 @@ jobs:
           cpanm --notest local::lib
           eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
           cpanm --notest PkgConfig
-          cpanm -v Alien::Build
+          cpanm --notest Alien::Build
           cpanm --notest Alien::Base::Wrapper
           cpanm --notest FFI::Platypus
           cpanm --notest FFI::Platypus::Declare

diff --git a/.github/workflows/linux_share_build.yml b/.github/workflows/linux_share_build.yml
@@ -42,6 +42,14 @@ jobs:
           echo '20220320a' >> perlversion.txt
           ls -l perlversion.txt
 
+      - name: Cache CPAN modules
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/perl5/
+          key: ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
+
       - name: Install Dynamic Dependencies
         run: |
           which -a cpanm

diff --git a/.github/workflows/macos_share_builds.yml b/.github/workflows/macos_share_builds.yml
@@ -43,8 +43,19 @@ jobs:
           echo '20221130' >> perlversion.txt
           ls -l perlversion.txt
 
+      - name: Cache CPAN modules
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/perl5/
+          key: ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }}
+
+
       - name: Install Dynamic Dependencies
         run: |
+          cpanm --notest local::lib
+          eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
           cpanm --notest Path::Tiny
           cpanm --notest Test::TempDir::Tiny
           cpanm --notest PDL
@@ -60,10 +71,12 @@ jobs:
       
       - name: Install Geo::GDAL::FFI deps
         run: |
+          eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
           cpanm --installdeps Geo::GDAL::FFI
   
       - name: Build
         run: |
+          eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
           #  bandaids
           #export DYLD_LIBRARY_PATH=`perl -MAlien::geos::af -e'print Alien::geos::af->dist_dir . "/lib"'`
           #export LD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}