travis+appveyor cleanups

diff --git a/.appveyor.yml b/.appveyor.yml
index 1ab2353aa16633656b10936344bf74bf24334646..bedd249540064fcb7a5e296796098053e7ba8b84 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,9 +17,6 @@ install:
     - SET PERL_MB_OPT=--install_base C:/Perl5
     - SET PERL_MM_OPT=INSTALL_BASE=C:/Perl5
     - cpanm --notest Env::Path IO::All Perl::Tidy Pod::Coverage::TrustPod String::ShellQuote Test::Code::TidyAll Test::Differences Test::EOL Test::Pod Test::Pod::Coverage Test::RunValgrind Test::TrailingSpace Test::Trap
-    # - git clone https://github.com/rrthomas/Recode ./recode
-    # - C:\msys64\usr\bin\bash.exe -l -x -c "test -e /mingw64/include/recode.h || bash -x c:/projects/fortune-mod/recode/build-aux/appveyor-install.sh"
-    # - C:\msys64\usr\bin\bash.exe -x -lc "test -e /mingw64/include/recode.h || cd c:/projects/fortune-mod/recode && ./bootstrap && ./configure --enable-silent-rules %CONFIGURE_FLAGS% && make && make install"
 build: off
 test_script:
     - set CMAKE_MAKE_PROGRAM=C:\strawberry\c\bin\gmake.exe
@@ -32,9 +29,6 @@ test_script:
     - SET PATH=%PATH%;C:\Python35-x64
     - SET FORTUNE_TEST_DEBUG=1
     - perl CI-testing/continuous-integration-testing.pl --gen="MSYS Makefiles"
-    - perl -E "exit(system(qq#perl CI-testing/continuous-integration-testing.pl --gen=@{[chr(34)]}MSYS Makefiles@{[chr(34)]}#) ? -1 : 0)"
-    # - curl -fsS -o Dependencies_x64_Release.zip "https://github.com/lucasg/Dependencies/releases/download/v1.10/Dependencies_x64_Release.zip"
-    # - c:\foo\games\fortune
 cache:
    - C:\msys64\mingw64
 shallow_clone: true

diff --git a/.travis.yml b/.travis.yml
index cc297ad3d7ee54ee2d44eadcaa4e9092072a0d4c..806f0f861879d5e8a8d8ebac43ff9449f16ddaab 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,20 +11,20 @@ addons:
             - valgrind
             - xz-utils
             - zip
+before_install:
+    - cpanm local::lib
+    - eval "$(perl -Mlocal::lib=$HOME/perl_modules)"
+    - cpanm Code::TidyAll::Plugin::ClangFormat Code::TidyAll::Plugin::Flake8 Code::TidyAll::Plugin::TestCount File::Find::Object List::Util Path::Tiny Perl::Critic Perl::Tidy Test::Code::TidyAll Test::Differences Test::RunValgrind
 cache:
     directories:
         - $HOME/perl_modules
         - $HOME/tidyall_d
-os: linux
 dist: bionic
-before_install:
-    - cpanm local::lib
-    - eval "$(perl -Mlocal::lib=$HOME/perl_modules)"
-    - cpanm Code::TidyAll::Plugin::ClangFormat Code::TidyAll::Plugin::Flake8 Code::TidyAll::Plugin::TestCount File::Find::Object List::Util Path::Tiny Perl::Critic Perl::Tidy Test::Code::TidyAll Test::Differences Test::RunValgrind
 install:
     # Required to avoid default travis "cpanm ." booboo.
     - true
 language: perl
+os: linux
 perl:
     - "5.30"
 script: