diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 28802388a..3fd02d5bc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,25 +28,6 @@ jobs: perl-version: "5.38" distribution: strawberry -# - name: Set up Perl -# run: | -# # choco install strawberryperl --version=5.40.0.1 -# choco upgrade strawberryperl --version 5.40.0.1 -# echo "C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append -# ##echo $env:PATH - - #- name: Check path - # run: | - # echo $env:PATH - # echo "glargglarg" - # echo $GITHUB_PATH - # echo "zogzogzog" - # $env:PATH = "C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;$env:PATH" - # echo $env:PATH - # echo "zigzig" - # echo "C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;$env:PATH" > $GITHUB_PATH - # echo $GITHUB_PATH - - name: perl -V run: perl -V @@ -64,42 +45,10 @@ jobs: restore-keys: | ${{ runner.os }}-build-${{ hashFiles('perlversion.txt') }} -# - name: Prepare for Alien cache -# run: | -# perl -V > aliencache.txt -# echo 'aliens' >> aliencache.txt -# dir aliencache.txt -# -# - name: Cache Alien downloads -# uses: actions/cache@v4 -# with: -# path: $HOMEPATH\.alienbuild -# key: ${{ runner.os }}-build-${{ hashFiles('aliencache.txt') }} -# restore-keys: | -# ${{ runner.os }}-build-${{ hashFiles('aliencache.txt') }} - - #- name: Install Dependencies - # run: curl -sL https://git.io/cpm | perl - install -g --show-build-log-on-failure - - - #- name: Install dependencies 1 - # run: | - # #cpanm --notest local::lib - # #eval "$(perl -Mlocal::lib=${PWD}/perl_modules)" - # cpanm --quiet --notest Alien::Build - # cpanm --quiet --notest Alien::Build::MM - # cpanm --quiet --notest Sort::Versions - # cpanm --quiet --notest PkgConfig - # cpanm --quiet --notest Alien::Build::Plugin::Cleanse::BuildDir - # cpanm --quiet --notest File::Find::Rule - # cpanm --quiet --notest Alien::Build::Plugin::Fetch::Cache - # cpanm --quiet --notest Env::ShellWords - # cpanm --quiet --notest Test2::Suite - # Was giving grief. Hurts not to leave here. - name: Install dependencies Sereal run: | - echo $env:PATH + #echo $env:PATH echo $env:PERL5LIB cpanm --installdeps Sereal::Decoder cpanm Sereal::Decoder @@ -134,7 +83,7 @@ jobs: cpanm --notest --installdeps Alien::gdal 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" + # $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" @@ -151,5 +100,5 @@ jobs: # Runs a set of commands using the runners shell - name: Run tests run: | - prove + prove -l \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index ba7de53a6..9cedfce58 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,6 @@ install: build_script: -# - prove -l - - perl -e "1" + - prove -l +# - perl -e "1"