Merge branch 'develop' into unstable
This commit is contained in:
commit
d1a485a35a
3
Gemfile
3
Gemfile
|
@ -12,6 +12,5 @@ group :multi_json do
|
||||||
gem "multi_json", "~> 1.0", require: false
|
gem "multi_json", "~> 1.0", require: false
|
||||||
end
|
end
|
||||||
|
|
||||||
gem "gson", ">= 0.6", require: false, platforms: :jruby
|
|
||||||
|
|
||||||
gem "codecov", require: false, group: :test
|
gem "codecov", require: false, group: :test
|
||||||
|
gem "gson", ">= 0.6", require: false, platforms: :jruby
|
||||||
|
|
12
script/ci
12
script/ci
|
@ -58,12 +58,12 @@ run_test() {
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
prepare_build &&
|
prepare_build
|
||||||
print_ruby_version &&
|
print_ruby_version
|
||||||
run_code_quality_checks &&
|
run_code_quality_checks
|
||||||
run_unit_tests &&
|
run_unit_tests
|
||||||
run_isolation_tests &&
|
run_isolation_tests
|
||||||
update_code_coverage
|
update_code_coverage
|
||||||
}
|
}
|
||||||
|
|
||||||
main
|
main
|
||||||
|
|
Loading…
Reference in New Issue