From c93cafb490844f44fd183e974817a4efb8e3066d Mon Sep 17 00:00:00 2001 From: Austin Ziegler Date: Mon, 22 Jun 2020 23:20:27 -0400 Subject: [PATCH] Finalize 1.4 release - Use GitHub Actions - Exclude windows code from non-windows tests - Exclude unsupported windows tests and allow windows failures for now because of line-ending differences - Remove Travis configuration --- .github/workflows/ci.yml | 21 ++++++++++++++++++--- .travis.yml | 24 ------------------------ README.rdoc | 5 ++--- Rakefile | 2 -- spec/spec_helper.rb | 5 +---- 5 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbf09ec..7d953b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,11 @@ jobs: test: strategy: matrix: - os: + os: - ubuntu - macos - windows - ruby: + ruby: - 2.5 - 2.6 - 2.7 @@ -33,8 +33,23 @@ jobs: - jruby-head - truffleruby - truffleruby-head + exclude: + - os: macos + ruby: mingw + - os: macos + ruby: mswin + - os: ubuntu + ruby: mingw + - os: ubuntu + ruby: mswin + - os: windows + ruby: debug + - os: windows + ruby: truffleruby + - os: windows + ruby: truffleruby-head runs-on: ${{ matrix.os }}-latest - continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }} + continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' || matrix.os == 'windows' }} steps: - uses: actions/checkout@v2 - name: Set up Ruby diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 103bc09..0000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -language: ruby -rvm: - - 2.8.0-dev - - 2.7.1 - - 2.6.6 - - 2.5.8 - - 2.4.10 - - jruby-9.2.11.1 - - ruby-head - - truffleruby -matrix: - allow_failures: - - rvm: ruby-head - - rvm: 2.8.0-dev - fast_finish: true -gemfile: - - Gemfile -before_script: - - bundle exec rake travis:before -t -script: bundle exec rake travis -after_script: - - bundle exec rake travis:after -t -sudo: false diff --git a/README.rdoc b/README.rdoc index f1a358e..07a9be7 100644 --- a/README.rdoc +++ b/README.rdoc @@ -4,8 +4,7 @@ home :: https://github.com/halostatue/diff-lcs code :: https://github.com/halostatue/diff-lcs bugs :: https://github.com/halostatue/diff-lcs/issues rdoc :: http://rubydoc.info/github/halostatue/diff-lcs -continuous integration :: {}[https://travis-ci.org/halostatue/diff-lcs] -test coverage :: {Coverage Status}[https://coveralls.io/r/halostatue/diff-lcs] +continuous integration :: {}[https://github.com/halostatue/diff-lcs/actions] == Description @@ -15,7 +14,7 @@ to create a simple HTML diff output format and a standard diff-like tool. This is release 1.4, providing a simple extension that allows for Diff::LCS::Change objects to be treated implicitly as arrays. Ruby versions -below 2.3 are soft-deprecated. +below 2.5 are soft-deprecated. This means that older versions are no longer part of the CI test suite. If any changes have been introduced that break those versions, bug reports and patches diff --git a/Rakefile b/Rakefile index f712d45..e6bbf86 100644 --- a/Rakefile +++ b/Rakefile @@ -48,6 +48,4 @@ if RUBY_VERSION >= '2.0' && RUBY_ENGINE == 'ruby' Rake::Task['spec'].execute end end - - # Rake::Task['travis'].prerequisites.replace(%w(spec:coveralls)) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e566d0e..4286129 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,10 +4,7 @@ require 'pathname' require 'psych' -if ENV['COVERALLS'] - require 'coveralls' - Coveralls.wear! -elsif ENV['COVERAGE'] +if ENV['COVERAGE'] require 'simplecov' def require_do(resource)