ghactions / travis cleanup; remove old/unneeded cruft

shlomif · Jan 28, 2025 · 0cd751c · 0cd751c
1 parent 7c00b51
commit 0cd751c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/use-github-actions.yml b/.github/workflows/use-github-actions.yml
@@ -9,8 +9,8 @@ jobs:
                 submodules: 'true'
         -   run: sudo apt-get update -qq
         -   run: sudo apt-get --no-install-recommends install -y build-essential cmake
-                cmake-data cpanminus libperl-dev mercurial ninja-build perl python3-dev
-                python3-pip python3-setuptools valgrind xz-utils zip
+                cmake-data cpanminus libperl-dev ninja-build perl python3-dev python3-pip
+                python3-setuptools valgrind xz-utils zip
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
                 } ; local_lib_shim ; PATH+=":${HOME}/.local/bin"
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
@@ -19,10 +19,6 @@ jobs:
                 } ; local_lib_shim ; eval "$(perl -Mlocal::lib=$HOME/perl_modules)"
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
                 } ; local_lib_shim ; which python3
-        -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; cpanm --notest Test::Code::TidyAll
-        -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; ( perl -M"Test::Code::TidyAll 9999" || true )
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
                 } ; local_lib_shim ; cpanm --notest Code::TidyAll::Plugin::ClangFormat
                 Code::TidyAll::Plugin::TestCount Dir::Manifest Dist::Zilla Env::Path

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ addons:
             - cmake-data
             - cpanminus
             - libperl-dev
-            - mercurial
             - ninja-build
             - perl
             - python3-dev
@@ -27,18 +26,14 @@ before_install:
     - eval "$(perl -Mlocal::lib=$HOME/perl_modules)"
 install:
     - which python3
-    - cpanm --notest Test::Code::TidyAll
-    - ( perl -M"Test::Code::TidyAll 9999" || true )
     - cpanm --notest Code::TidyAll::Plugin::ClangFormat Code::TidyAll::Plugin::TestCount Dir::Manifest Dist::Zilla Env::Path Games::Solitaire::Verify::Solution IO::All Inline Inline::C Perl::Critic Perl::Tidy Pod::Weaver::PluginBundle::SHLOMIF Pod::Weaver::Section::Support Test::CPAN::Changes Test::Code::TidyAll Test::Differences Test::Kwalitee Test::Pod Test::Pod::Coverage Test::RunValgrind Test::Some Test::TrailingSpace Test::Trap
     - "( cd black-hole-solitaire/Games-Solitaire-BlackHole-Solver/ && dzil authordeps --missing | grep -vP '[^\\w:]' | xargs -n 5 -P 10 cpanm --quiet --notest )"
     - "( cd black-hole-solitaire/Games-Solitaire-BlackHole-Solver/ && dzil listdeps --author --missing | grep -vP '[^\\w:]' | xargs cpanm --verbose --notest )"
     - python3 -m pip install --user cookiecutter pydistman tox
     - python3 --version
-    # No longer python3.6 in ubuntu focal.
-    # - which python3.6
     - ( set -e -x ; cd black-hole-solitaire/python-bindings/cffi/ && python3 python_pypi_dist_manager.py build_only && cd dest && python3 -m pip install --user -r requirements.txt )
 perl:
-    - "5.26"
+    - "5.40"
 python:
     - "3.12"
 script: