Skip to content

Commit

Permalink
CI wrangling
Browse files Browse the repository at this point in the history
update actions versions

shorten cpan build dir on windows

more system installs on mac
  • Loading branch information
shawnlaffan committed Nov 4, 2024
1 parent 259727d commit 8e4b123
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux_de_locale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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') }}
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: macOS-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Perl
run: |
Expand All @@ -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

Expand All @@ -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') }}
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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') }}
Expand All @@ -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') }}
Expand Down Expand Up @@ -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: |
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e4b123

Please sign in to comment.