summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2020-06-22 23:46:08 -0400
committerGitHub <noreply@github.com>2020-06-22 23:46:08 -0400
commit4168a8eb56231152697290d14ac62a02eac9ac3f (patch)
tree35a679952ea38a2e5499b5da390b047f3cd3718d
parentfbbe93f99c749bdd1b955483b9d1225658563ec8 (diff)
parentc93cafb490844f44fd183e974817a4efb8e3066d (diff)
downloaddiff-lcs-4168a8eb56231152697290d14ac62a02eac9ac3f.tar.gz
Merge pull request #55 from halostatue/release-v14v1.4
Prepare for 1.4 release
-rw-r--r--.github/workflows/ci.yml21
-rw-r--r--.travis.yml24
-rw-r--r--README.rdoc5
-rw-r--r--Rakefile2
-rw-r--r--spec/spec_helper.rb5
5 files changed, 21 insertions, 36 deletions
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 :: {<img src="https://travis-ci.org/halostatue/diff-lcs.svg" />}[https://travis-ci.org/halostatue/diff-lcs]
-test coverage :: {<img src="https://coveralls.io/repos/halostatue/diff-lcs/badge.svg" alt="Coverage Status" />}[https://coveralls.io/r/halostatue/diff-lcs]
+continuous integration :: {<img src="https://github.com/halostatue/diff-lcs/workflows/CI/badge.svg" />}[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 'rubygems'
require 'pathname'
require 'psych'
-if ENV['COVERALLS']
- require 'coveralls'
- Coveralls.wear!
-elsif ENV['COVERAGE']
+if ENV['COVERAGE']
require 'simplecov'
def require_do(resource)