From 43f07777ae5f423f3fdea7051bda4d979b1383ca Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 11 Aug 2021 11:38:23 -0700 Subject: [PATCH 1/6] CI update for coveralls. --- .github/workflows/ci.yml | 11 ++++++++--- .travis.yml | 16 ---------------- Gemfile | 4 ++-- spec/spec_helper.rb | 12 +++++++++--- 4 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d5176a..3475da9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,14 +15,15 @@ jobs: runs-on: ubuntu-latest env: CI: true + ALLOW_FAILURES: ${{ endsWith(matrix.ruby, 'head') }} strategy: fail-fast: false matrix: ruby: - - 2.4 - 2.5 - 2.6 - 2.7 + - 3.0 - ruby-head - jruby steps: @@ -35,5 +36,9 @@ jobs: - name: Install dependencies run: bundle install --jobs 4 --retry 3 - name: Run tests - run: bundle exec rspec spec - + run: bundle exec rspec spec || $ALLOW_FAILURES + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v1.1.2 + if: "matrix.ruby == '3.0'" + with: + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 83a126b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: ruby -script: "bundle exec rspec spec" -env: - - CI=true -rvm: - - 2.4 - - 2.5 - - 2.6 - - 2.7 - - jruby -cache: bundler -sudo: false -matrix: - allow_failures: - - rvm: jruby -dist: trusty diff --git a/Gemfile b/Gemfile index 15b1c08..febdb81 100644 --- a/Gemfile +++ b/Gemfile @@ -16,8 +16,8 @@ group :development, :test do gem "rdf-vocab", github: "ruby-rdf/rdf-vocab", branch: "develop" gem 'sxp', github: "dryruby/sxp.rb", branch: "develop" gem 'rake' - gem 'simplecov', require: false - gem 'ruby-prof', platform: :mri + gem 'simplecov', '~> 0.21', platforms: :mri + gem 'simplecov-lcov', '~> 0.8', platforms: :mri end group :debug do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4d5dd04..663ea3d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,15 +15,21 @@ begin require 'simplecov' - require 'coveralls' + require 'simplecov-lcov' + + SimpleCov::Formatter::LcovFormatter.config do |config| + #Coveralls is coverage by default/lcov. Send info results + config.report_with_single_file = true + config.single_report_path = 'coverage/lcov.info' + end + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ]) SimpleCov.start do add_filter "/spec/" end - Coveralls.wear! rescue LoadError end From ef53ba0e229e32f0a39c6820ee73e264afbd67d5 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 11 Aug 2021 11:42:38 -0700 Subject: [PATCH 2/6] CI update for coveralls. --- spec/spec_helper.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 663ea3d..6cf4aaa 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,8 +2,6 @@ $:.unshift File.dirname(__FILE__) require "bundler/setup" -require 'simplecov' -SimpleCov.start require 'rspec' require 'matchers' require 'rdf/spec/matchers' From f511cf9ba46ab41e0bda3b8bb167cf38334ca64a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 26 Oct 2021 11:39:54 -0700 Subject: [PATCH 3/6] Update CI. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3475da9..5f45ff1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies run: bundle install --jobs 4 --retry 3 - name: Run tests - run: bundle exec rspec spec || $ALLOW_FAILURES + run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - name: Coveralls GitHub Action uses: coverallsapp/github-action@v1.1.2 if: "matrix.ruby == '3.0'" From cab2b2729219a8f0e5c3ebd010bbaec785f58c24 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 8 Dec 2021 10:57:02 -0800 Subject: [PATCH 4/6] Update documentation, dependencies, and version sync for 0.8. --- .github/workflows/ci.yml | 1 - README.md | 4 ++-- VERSION | 2 +- rdf-reasoner.gemspec | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f45ff1..970180d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,6 @@ jobs: fail-fast: false matrix: ruby: - - 2.5 - 2.6 - 2.7 - 3.0 diff --git a/README.md b/README.md index 8d26cf6..0df5317 100644 --- a/README.md +++ b/README.md @@ -121,8 +121,8 @@ The `rdf` command-line interface is extended with `entail` and `lint` commands. ## Dependencies -* [Ruby](https://ruby-lang.org/) (>= 2.4) -* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1) +* [Ruby](https://ruby-lang.org/) (>= 2.6) +* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2) ## Mailing List diff --git a/VERSION b/VERSION index 7486fdb..a3df0a6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.2 +0.8.0 diff --git a/rdf-reasoner.gemspec b/rdf-reasoner.gemspec index 2216e4b..9459e75 100755 --- a/rdf-reasoner.gemspec +++ b/rdf-reasoner.gemspec @@ -25,11 +25,11 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 2.4' gem.requirements = [] - gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.12' - gem.add_runtime_dependency 'rdf-xsd', '~> 3.1' + gem.add_runtime_dependency 'rdf', '~> 3.2' + gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' - gem.add_development_dependency 'rdf-spec', '~> 3.1' - gem.add_development_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.10' + gem.add_development_dependency 'rdf-spec', '~> 3.2' + gem.add_development_dependency 'rdf-vocab', '~> 3.2' gem.add_development_dependency 'rdf-turtle', '~> 3.1' gem.add_development_dependency 'json-ld', '~> 3.1' gem.add_development_dependency 'equivalent-xml', '~> 0.6' From 5a43485ae4d1db27fb265f7c1d4d4317ea483396 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 13 Dec 2021 14:46:17 -0800 Subject: [PATCH 5/6] Sync more gem versions. --- rdf-reasoner.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rdf-reasoner.gemspec b/rdf-reasoner.gemspec index 9459e75..d6b18c9 100755 --- a/rdf-reasoner.gemspec +++ b/rdf-reasoner.gemspec @@ -23,15 +23,15 @@ Gem::Specification.new do |gem| the vocabulary ruleset. This can be used to implement SPARQL Entailment Regimes.).gsub(/\s+/m, ' ') - gem.required_ruby_version = '>= 2.4' + gem.required_ruby_version = '>= 2.6' gem.requirements = [] gem.add_runtime_dependency 'rdf', '~> 3.2' gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' gem.add_development_dependency 'rdf-spec', '~> 3.2' gem.add_development_dependency 'rdf-vocab', '~> 3.2' - gem.add_development_dependency 'rdf-turtle', '~> 3.1' - gem.add_development_dependency 'json-ld', '~> 3.1' + gem.add_development_dependency 'rdf-turtle', '~> 3.2' + gem.add_development_dependency 'json-ld', '~> 3.2' gem.add_development_dependency 'equivalent-xml', '~> 0.6' gem.add_development_dependency 'rspec', '~> 3.10' gem.add_development_dependency 'yard' , '~> 0.9' From 8ac2e0ad7cb1767b3254c260eb2715a6353f6979 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 26 Dec 2021 22:38:11 -0800 Subject: [PATCH 6/6] CI on Ruby 3.1. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 970180d..0aaedb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: - 2.6 - 2.7 - 3.0 + - 3.1 - ruby-head - jruby steps: