Skip to content

Commit

Permalink
Merge pull request #606 from ThrowTheSwitch/minor_release_0_31_1
Browse files Browse the repository at this point in the history
Grab latest dependencies.
  • Loading branch information
mvandervoord authored Jun 18, 2021
2 parents 069c9c2 + c77828b commit ca463d0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ceedling.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Ceedling projects are created with a YAML configuration file. A variety of conve
s.required_ruby_version = ">= 2.4.0"

s.add_dependency "thor", "~> 0.14"
s.add_dependency "rake", "~> 12"
s.add_dependency "rake", ">= 12", "< 14"
s.add_dependency "deep_merge", "~> 1.2"
s.add_dependency "constructor", "~> 2"

Expand Down
2 changes: 1 addition & 1 deletion lib/ceedling/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module Version
eval("#{name} = '#{a.join(".")}'")
end

GEM = "0.31.0"
GEM = "0.31.1"
CEEDLING = GEM
end
end
2 changes: 1 addition & 1 deletion plugins/gcov/lib/gcovr_reportinator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def make_reports(opts)
# Build the common gcovr arguments.
args_common = args_builder_common(opts)

if (gcovr_version_info[0] >= 4) && (gcovr_version_info[1] >= 2)
if ((gcovr_version_info[0] == 4) && (gcovr_version_info[1] >= 2)) || (gcovr_version_info[0] > 4)
# gcovr version 4.2 and later supports generating multiple reports with a single call.
args = args_common
args += args_builder_cobertura(opts, false)
Expand Down
2 changes: 1 addition & 1 deletion spec/gcov/gcov_deployment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

@output = `bundle exec ruby -S ceedling utils:gcov`
expect(@output).to match(/For now, creating only an HtmlBasic report\./)
expect(@output).to match(/Creating gcov results report\(s\) in 'build\/artifacts\/gcov'\.\.\. Done/)
expect(@output).to match(/Creating (?:a )?gcov (?:results)?(?:HTML)? report(?:\(s\))? in 'build\/artifacts\/gcov'\.\.\. Done/)
expect(File.exists?('build/artifacts/gcov/GcovCoverageResults.html')).to eq true

end
Expand Down

0 comments on commit ca463d0

Please sign in to comment.