Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
with:
ruby-version: 2.4
ruby-version: 2.5

- name: Install dependencies
run: bundle install
Expand All @@ -35,6 +35,8 @@ jobs:
working-directory: ./coverage
run: |
sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' .resultset.json
ruby -rjson -e 'sqube = JSON.load(File.read(".resultset.json"))["RSpec"]["coverage"].transform_values {|lines| lines["lines"]}; total = { "RSpec" => { "coverage" => sqube, "timestamp" => Time.now.to_i }}; puts JSON.dump(total)' > .resultset.sonarqube.json


- name: SonarQube Scan (Push)
if: github.event_name == 'push'
Expand All @@ -47,7 +49,7 @@ jobs:
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
-Dsonar.projectName=${{ github.event.repository.name }}
-Dsonar.projectKey=${{ github.event.repository.name }}
-Dsonar.ruby.coverage.reportPaths='coverage/.resultset.json'
-Dsonar.ruby.coverage.reportPaths=coverage/.resultset.sonarqube.json
-Dsonar.c.file.suffixes=-
-Dsonar.cpp.file.suffixes=-
-Dsonar.objc.file.suffixes=-
Expand All @@ -65,7 +67,7 @@ jobs:
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
-Dsonar.projectName=${{ github.event.repository.name }}
-Dsonar.projectKey=${{ github.event.repository.name }}
-Dsonar.ruby.coverage.reportPaths='coverage/.resultset.json'
-Dsonar.ruby.coverage.reportPaths=coverage/.resultset.sonarqube.json
-Dsonar.c.file.suffixes=-
-Dsonar.cpp.file.suffixes=-
-Dsonar.objc.file.suffixes=-
Expand Down
2 changes: 2 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
require 'pry'

require 'webmock/rspec'
require 'simplecov-json'
SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
WebMock.disable_net_connect!

ENV['SPLITCLIENT_ENV'] ||= 'test'
Expand Down
3 changes: 2 additions & 1 deletion splitclient-rb.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'rake-compiler'
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'rubocop', '0.59.0'
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'simplecov', '0.20.0'
spec.add_development_dependency 'simplecov-json'
spec.add_development_dependency 'timecop'
spec.add_development_dependency 'webmock'

Expand Down