Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.0: Fix TruffleRuby simplecov #704

Merged
merged 1 commit into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .github/workflows/rubocop.yml

This file was deleted.

20 changes: 17 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@ name: ruby-saml CI
on: [push, pull_request]

jobs:
rubocop:
runs-on: ubuntu-latest
env:
CI: true
TESTOPTS: '-v'
steps:
- uses: actions/checkout@v3
- name: Set up Ruby 3.3
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
bundler-cache: true
- name: Install dependencies
run: bundle install
- name: Run RuboCop
run: bundle exec rubocop --parallel

test:
name: Unit test
strategy:
Expand Down Expand Up @@ -40,9 +57,6 @@ jobs:

- name: Coveralls
uses: coverallsapp/github-action@master
# 2023/03/07 - Simplecov is not working on TruffleRuby.
# TruffleRuby tests are otherwise passing.
if: ${{ matrix.ruby-version != 'truffleruby' }}
with:
github-token: ${{ secrets.github_token }}
parallel: true
Expand Down
23 changes: 10 additions & 13 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# 2023/03/07 - Simplecov is not working on TruffleRuby.
unless defined?(TruffleRuby)
require 'simplecov'
require 'simplecov-lcov'
SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
SimpleCov::Formatter::LcovFormatter.config.output_directory = 'coverage'
SimpleCov::Formatter::LcovFormatter.config.lcov_file_name = 'lcov.info'
SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
SimpleCov.start do
add_filter "test/"
add_filter "vendor/"
add_filter "lib/ruby_saml/logging.rb"
end
require 'simplecov'
require 'simplecov-lcov'
SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
SimpleCov::Formatter::LcovFormatter.config.output_directory = 'coverage'
SimpleCov::Formatter::LcovFormatter.config.lcov_file_name = 'lcov.info'
SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
SimpleCov.start do
add_filter "test/"
add_filter "vendor/"
add_filter "lib/ruby_saml/logging.rb"
end

require 'stringio'
Expand Down
Loading