diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c6021be..4c85e8a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,7 +17,8 @@ jobs: fail-fast: false matrix: cip: - - tag: "5.39" + - tag: "5.41" + - tag: "5.40" - tag: "5.38" - tag: "5.38-alpine3.16" - tag: "5.38-fedora36" @@ -41,7 +42,7 @@ jobs: CIP_TAG: ${{ matrix.cip.tag }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Bootstrap CIP run: | @@ -54,7 +55,7 @@ jobs: cip cache-key - name: Cache CPAN modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.cip key: ${{ runner.os }}-build-${{ steps.cache-key.outputs.key }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml deleted file mode 100644 index 7146e28..0000000 --- a/.github/workflows/macos.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: macos - -on: - push: - branches: - - '*' - tags-ignore: - - '*' - pull_request: - -env: - PERL5LIB: /Users/runner/perl5/lib/perl5 - PERL_LOCAL_LIB_ROOT: /Users/runner/perl5 - PERL_MB_OPT: --install_base /Users/runner/perl5 - PERL_MM_OPT: INSTALL_BASE=/Users/runner/perl5 - -jobs: - perl: - - runs-on: macOS-latest - - strategy: - fail-fast: false - matrix: - alien: - - install_type: share -# - install_type: system -# packages: - - env: - ALIEN_INSTALL_TYPE: ${{ matrix.alien.install_type }} - - steps: - - uses: actions/checkout@v2 - - - name: Set up Perl - run: | - brew install perl ${{ matrix.alien.packages }} libffi libarchive - curl https://cpanmin.us | perl - App::cpanminus -n - echo "/Users/runner/perl5/bin" >> $GITHUB_PATH - - - name: perl -V - run: perl -V - - - name: Prepare for cache - run: | - perl -V > perlversion.txt - ls -l perlversion.txt - - - name: Cache CPAN modules - uses: actions/cache@v1 - with: - path: ~/perl5 - key: ${{ runner.os }}-build-${{ matrix.alien.install_type }}-${{ hashFiles('perlversion.txt') }} - restore-keys: | - ${{ runner.os }}-build-${{ matrix.alien.install_type }}-${{ hashFiles('perlversion.txt') }} - - - name: Install Dependencies - run: | - perl Makefile.PL - cpanm --installdeps . - - - name: Build - run: make - - - name: Test - run: make test TEST_VERBOSE=1 - - - name: CPAN log - if: ${{ failure() }} - run: | - cat ~/.cpanm/latest-build/build.log diff --git a/Changes b/Changes index 6e3a87e..abe51d5 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for Alien-pkgconf + - Updated fetch script to account for new directory listing (gh#22) + 0.20 2024-03-11 06:17:00 -0600 - JSON output is sorted to make build reproducable (ppisar++ gh#19) diff --git a/Makefile.PL b/Makefile.PL index ec42174..8987e7e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -32,7 +32,7 @@ my %args = ( 'Test::Alien' => '0.08', }, BUILD_REQUIRES => { - 'HTTP::Tiny' => '0.044', + 'HTTP::Tiny' => '0.055', 'Archive::Tar' => '2.24', 'JSON::PP' => '2.27400', # as of 1.2.1 upstream provides .gz diff --git a/script/fetch.pl b/script/fetch.pl index 7647050..9fe7f4a 100644 --- a/script/fetch.pl +++ b/script/fetch.pl @@ -88,7 +88,7 @@ sub extcmp my @list; - while($res->{content} =~ /\{content} =~ /\>(pkgconf-([0-9\.]+)\.tar.*)\