diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8071426..d28ef3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,3 +47,21 @@ jobs: env: JRUBY_OPTS: --debug run: bundle exec rake + coveralls: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + bundler-cache: true + - name: Install dependencies + run: bundle install + - name: Run tests + run: bundle exec rake + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v1.1.2 + with: + github-token: ${{ secrets.github_token }} + path-to-lcov: './coverage/lcov/omniauth-oauth2.lcov' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 92d3676..0000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -bundler_args: --without development -before_install: - - gem update --system - - gem update bundler -cache: bundler -env: - global: - - JRUBY_OPTS="$JRUBY_OPTS --debug" -language: ruby -rvm: - - jruby-9000 - - 2.4.4 - - 2.5.3 - - jruby-head - - ruby-head - - truffleruby-head -matrix: - allow_failures: - - rvm: jruby-head - - rvm: ruby-head - fast_finish: true -sudo: false diff --git a/Gemfile b/Gemfile index 75f41f6..8b1902f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,14 +4,15 @@ gem "rake", "~> 12.0" group :test do gem "addressable", "~> 2.3.8", :platforms => %i[jruby ruby_18] - gem "coveralls" + gem 'coveralls_reborn', '~> 0.19.0', require: false gem "json", :platforms => %i[jruby ruby_18 ruby_19] gem "mime-types", "~> 1.25", :platforms => %i[jruby ruby_18] gem "rack-test" gem "rest-client", "~> 1.8.0", :platforms => %i[jruby ruby_18] gem "rspec", "~> 3.2" gem "rubocop", ">= 0.51", :platforms => %i[ruby_19 ruby_20 ruby_21 ruby_22 ruby_23 ruby_24] - gem "simplecov", ">= 0.9" + gem 'simplecov-lcov' + gem 'tins', '~> 1.13', :platforms => %i[jruby_18 jruby_19 ruby_19] gem "webmock", "~> 3.0" end diff --git a/README.md b/README.md index b433fd8..08722d6 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@ # OmniAuth OAuth2 [![Gem Version](http://img.shields.io/gem/v/omniauth-oauth2.svg)][gem] -[![Build Status](http://img.shields.io/travis/omniauth/omniauth-oauth2.svg)][travis] [![Code Climate](http://img.shields.io/codeclimate/maintainability/intridea/omniauth-oauth2.svg)][codeclimate] [![Coverage Status](http://img.shields.io/coveralls/intridea/omniauth-oauth2.svg)][coveralls] [![Security](https://hakiri.io/github/omniauth/omniauth-oauth2/master.svg)](https://hakiri.io/github/omniauth/omniauth-oauth2/master) [gem]: https://rubygems.org/gems/omniauth-oauth2 -[travis]: http://travis-ci.org/omniauth/omniauth-oauth2 [codeclimate]: https://codeclimate.com/github/intridea/omniauth-oauth2 [coveralls]: https://coveralls.io/r/intridea/omniauth-oauth2 @@ -32,7 +30,7 @@ module OmniAuth # This is where you pass the options you would pass when # initializing your consumer from the OAuth gem. option :client_options, {:site => "https://api.somesite.com"} - + # You may specify that your strategy should use PKCE by setting # the pkce option to true: https://tools.ietf.org/html/rfc7636 option :pkce, true diff --git a/spec/helper.rb b/spec/helper.rb index 280be5f..36fa0af 100644 --- a/spec/helper.rb +++ b/spec/helper.rb @@ -3,9 +3,16 @@ if RUBY_VERSION >= "1.9" require "simplecov" + require "simplecov-lcov" require "coveralls" - SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter] + SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true + + SimpleCov.formatters = [ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::LcovFormatter, + Coveralls::SimpleCov::Formatter + ] SimpleCov.start do minimum_coverage(78.48)