Skip to content

Commit f6578b9

Browse files
Merge pull request #390 from splitio/AUT-1158-Fix-Sonar
sonarqube coverage fixed
2 parents 29ecf8a + 0559b44 commit f6578b9

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Ruby
2424
uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
2525
with:
26-
ruby-version: 2.4
26+
ruby-version: 2.5
2727

2828
- name: Install dependencies
2929
run: bundle install
@@ -35,6 +35,8 @@ jobs:
3535
working-directory: ./coverage
3636
run: |
3737
sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' .resultset.json
38+
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
39+
3840
3941
- name: SonarQube Scan (Push)
4042
if: github.event_name == 'push'
@@ -47,7 +49,7 @@ jobs:
4749
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
4850
-Dsonar.projectName=${{ github.event.repository.name }}
4951
-Dsonar.projectKey=${{ github.event.repository.name }}
50-
-Dsonar.ruby.coverage.reportPaths='coverage/.resultset.json'
52+
-Dsonar.ruby.coverage.reportPaths=coverage/.resultset.sonarqube.json
5153
-Dsonar.c.file.suffixes=-
5254
-Dsonar.cpp.file.suffixes=-
5355
-Dsonar.objc.file.suffixes=-
@@ -65,7 +67,7 @@ jobs:
6567
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
6668
-Dsonar.projectName=${{ github.event.repository.name }}
6769
-Dsonar.projectKey=${{ github.event.repository.name }}
68-
-Dsonar.ruby.coverage.reportPaths='coverage/.resultset.json'
70+
-Dsonar.ruby.coverage.reportPaths=coverage/.resultset.sonarqube.json
6971
-Dsonar.c.file.suffixes=-
7072
-Dsonar.cpp.file.suffixes=-
7173
-Dsonar.objc.file.suffixes=-

spec/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
require 'pry'
99

1010
require 'webmock/rspec'
11+
require 'simplecov-json'
12+
SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
1113
WebMock.disable_net_connect!
1214

1315
ENV['SPLITCLIENT_ENV'] ||= 'test'

splitclient-rb.gemspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ Gem::Specification.new do |spec|
4545
spec.add_development_dependency 'rake-compiler'
4646
spec.add_development_dependency 'rspec'
4747
spec.add_development_dependency 'rubocop', '0.59.0'
48-
spec.add_development_dependency 'simplecov'
48+
spec.add_development_dependency 'simplecov', '0.20.0'
49+
spec.add_development_dependency 'simplecov-json'
4950
spec.add_development_dependency 'timecop'
5051
spec.add_development_dependency 'webmock'
5152

0 commit comments

Comments
 (0)