diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml deleted file mode 100644 index e520750..0000000 --- a/.github/workflows/cygwin.yml +++ /dev/null @@ -1,89 +0,0 @@ -name: cygwin - -on: - push: - branches: - - '*' - tags-ignore: - - '*' - pull_request: - -env: - PERL5LIB: /cygdrive/c/cx/lib/perl5 - PERL_LOCAL_LIB_ROOT: /cygdrive/cx - PERL_MB_OPT: --install_base /cygdrive/c/cx - PERL_MM_OPT: INSTALL_BASE=/cygdrive/c/cx - ALIEN_BUILD_PLUGIN_PKGCONFIG_COMMANDLINE_TEST: 1 # Test Alien::Build::Plugin::PkgConfig::CommandLine - CYGWIN_NOWINPATH: 1 - -jobs: - perl: - - runs-on: windows-latest - - strategy: - fail-fast: false - - defaults: - run: - shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}' - - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - shell: powershell - - - uses: actions/checkout@v2 - - - name: Set up Cygwin - uses: egor-tensin/setup-cygwin@v3 - with: - platform: x64 - packages: make perl gcc-core gcc-g++ pkg-config libcrypt-devel libssl-devel git libffi-devel libarchive-devel - - - name: perl -V - run: | - perl -V - gcc --version - - - name: Prepare for cache - run: | - perl -V > perlversion.txt - gcc --version >> perlversion.txt - ls perlversion.txt - - - name: Cache CPAN modules - uses: actions/cache@v1 - with: - path: c:\cx - key: ${{ runner.os }}-build-cygwin-${{ hashFiles('perlversion.txt') }} - restore-keys: | - ${{ runner.os }}-build-cygwin-${{ hashFiles('perlversion.txt') }} - - - name: Install Static Dependencies - run: | - export PATH="/cygdrive/c/cx/bin:$PATH" - cd $( cygpath -u $GITHUB_WORKSPACE ) - yes | cpan App::cpanminus || true - cpanm -n Dist::Zilla - perl -S dzil authordeps --missing | perl -S cpanm -n - perl -S dzil listdeps --missing | perl -S cpanm -n - - - name: Install Dynamic Dependencies - run: | - export PATH="/cygdrive/c/cx/bin:$PATH" - cd $( cygpath -u $GITHUB_WORKSPACE ) - perl -S dzil run --no-build 'perl -S cpanm --installdeps .' - - - name: Run Tests - run: | - export PATH="/cygdrive/c/cx/bin:$PATH" - cd $( cygpath -u $GITHUB_WORKSPACE ) - perl -S dzil test -v - - - name: CPAN log - if: ${{ failure() }} - run: | - cat ~/.cpanm/latest-build/build.log diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 825b365..5848471 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,8 +17,9 @@ jobs: fail-fast: false matrix: cip_tag: - - static - - "5.37" + - "5.41" + - "5.40" + - "5.38" - "5.36" - "5.34" - "5.32" diff --git a/.github/workflows/msys2-mingw.yml b/.github/workflows/msys2-mingw.yml deleted file mode 100644 index 2743442..0000000 --- a/.github/workflows/msys2-mingw.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: msys2-mingw - -on: - push: - branches: - - '*' - tags-ignore: - - '*' - pull_request: - -env: - PERL5LIB: /c/cx/lib/perl5:/c/cx/lib/perl5/MSWin32-x64-multi-thread - PERL_LOCAL_LIB_ROOT: c:/cx - PERL_MB_OPT: --install_base C:/cx - PERL_MM_OPT: INSTALL_BASE=C:/cx - ALIEN_BUILD_PLUGIN_PKGCONFIG_COMMANDLINE_TEST: 1 # Test Alien::Build::Plugin::PkgConfig::CommandLine - -jobs: - perl: - - runs-on: windows-latest - - strategy: - fail-fast: false - - defaults: - run: - shell: msys2 {0} - - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - shell: powershell - - - uses: actions/checkout@v2 - - - name: Set up Perl - uses: msys2/setup-msys2@v2 - with: - update: true - install: >- - base-devel - mingw-w64-x86_64-toolchain - mingw-w64-x86_64-perl - mingw-w64-x86_64-libffi - mingw-w64-x86_64-libarchive - - - name: perl -V - run: | - perl -V - - - name: Prepare for cache - run: | - perl -V > perlversion.txt - ls perlversion.txt - - - name: Cache CPAN modules - uses: actions/cache@v1 - with: - path: c:\cx - key: ${{ runner.os }}-build-msys2-${{ hashFiles('perlversion.txt') }} - restore-keys: | - ${{ runner.os }}-build-msys2-${{ hashFiles('perlversion.txt') }} - - - name: Install Static Dependencies - run: | - export PATH="/c/cx/bin:$PATH" - yes | cpan App::cpanminus || true - cpanm -n Dist::Zilla - perl -S dzil authordeps --missing | perl -S cpanm -n - perl -S dzil listdeps --missing | perl -S cpanm -n - - - name: Install Dynamic Dependencies - run: | - export PATH="/c/cx/bin:$PATH" - perl -S dzil run --no-build 'perl -S cpanm --installdeps .' - - - name: Run Tests - run: | - export PATH="/c/cx/bin:$PATH" - perl -S dzil test -v diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 0000000..cba7de1 --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,28 @@ +name: static + +on: + push: + branches: + - '*' + tags-ignore: + - '*' + pull_request: + +jobs: + perl: + + runs-on: ubuntu-latest + + env: + CIP_TAG: static + + steps: + - uses: actions/checkout@v2 + + - name: Bootstrap CIP + run: | + curl -L https://raw.githubusercontent.com/uperl/cip/main/bin/github-bootstrap | bash + + - name: Build + Test + run: | + cip script diff --git a/Changes b/Changes index af2597d..985171a 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Revision history for {{$dist->name}} {{$NEXT}} + - Supress warning in Makefile.PL about calling getppid in void context (gh#12, gh#13) 0.09 2018-12-06 21:07:21 -0500 - Detect PowerShell on Unix (pwsh) diff --git a/README.md b/README.md index eb5656d..746bf92 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Shell::Guess ![linux](https://github.com/uperl/Shell-Guess/workflows/linux/badge.svg) ![windows](https://github.com/uperl/Shell-Guess/workflows/windows/badge.svg) ![macos](https://github.com/uperl/Shell-Guess/workflows/macos/badge.svg) ![cygwin](https://github.com/uperl/Shell-Guess/workflows/cygwin/badge.svg) ![msys2-mingw](https://github.com/uperl/Shell-Guess/workflows/msys2-mingw/badge.svg) +# Shell::Guess ![static](https://github.com/uperl/Shell-Guess/workflows/static/badge.svg) ![linux](https://github.com/uperl/Shell-Guess/workflows/linux/badge.svg) ![windows](https://github.com/uperl/Shell-Guess/workflows/windows/badge.svg) ![macos](https://github.com/uperl/Shell-Guess/workflows/macos/badge.svg) Make an educated guess about the shell in use @@ -511,7 +511,7 @@ Julien Fiegehenn (SIMBABQUE) # COPYRIGHT AND LICENSE -This software is copyright (c) 2012 by Graham Ollis. +This software is copyright (c) 2012-2023 by Graham Ollis. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff --git a/dist.ini b/dist.ini index 9b33e55..5e2afac 100644 --- a/dist.ini +++ b/dist.ini @@ -2,7 +2,7 @@ name = Shell-Guess author = Graham Ollis license = Perl_5 copyright_holder = Graham Ollis -copyright_year = 2012-2022 +copyright_year = 2012-2023 version = 0.09 @@ -14,11 +14,10 @@ diag = +Win32::Getppid diag = +Win32::Process::List github_user = uperl +workflow = static workflow = linux workflow = windows workflow = macos -workflow = cygwin -workflow = msys2-mingw [RemovePrereqs] @@ -47,7 +46,7 @@ contributor = Julien Fiegehenn (SIMBABQUE) [Meta::Dynamic::Config] [DynamicPrereqs / DynamicPrereqsUnixWithoutProc] --condition = ($^O ne 'dos' && $^O ne 'VMS' && $^O ne 'MSWin32' && eval { getppid; 1 }) && ! do { require File::Spec; -e File::Spec->catfile('', 'proc', getppid, 'cmdline') } +-condition = ($^O ne 'dos' && $^O ne 'VMS' && $^O ne 'MSWin32' && eval { my $ppid = getppid; 1 }) && ! do { require File::Spec; -e File::Spec->catfile('', 'proc', getppid, 'cmdline') } -body = requires('Unix::Process'); [DynamicPrereqs / DynamicPrereqsWinblows]