From 4dce0f53bfb93b6e4bb0192d490f1ea00d5807d4 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Mon, 31 Aug 2020 12:11:45 +0200 Subject: [PATCH 1/9] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 134679cfe..499e98fcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ matrix: - rvm: ruby-head - rvm: jruby-head - rvm: rbx-3 + - rvm: truffleruby-head allow_failures: - rvm: ruby-head - rvm: jruby-head From 11a842a665f331d803667f7c52b5d007218b20de Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Mon, 31 Aug 2020 20:41:18 +0200 Subject: [PATCH 2/9] Remove rubocop from default rake tasks --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 58788aa82..4263dd1e6 100644 --- a/Rakefile +++ b/Rakefile @@ -24,4 +24,4 @@ require 'rainbow/ext/string' unless String.respond_to?(:color) require 'rubocop/rake_task' RuboCop::RakeTask.new -task default: %i[rubocop spec] +task default: :spec From 8d75e005fe20d1cbd6d3deeccdff9761c51013c7 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Mon, 31 Aug 2020 20:47:39 +0200 Subject: [PATCH 3/9] Run rubocop once --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 499e98fcd..767c1d82d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ sudo: false # "gemfile" is required for "allow_failures" option, # see https://docs.travis-ci.com/user/customizing-the-build/#matching-jobs-with-allow_failures gemfile: +script: rubocop matrix: include: From 65471dfc9d5f274592526ae6f2aa0307fb76edb3 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Mon, 31 Aug 2020 20:56:12 +0200 Subject: [PATCH 4/9] Run rubocop as a separate command --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 767c1d82d..c02a82726 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ sudo: false # "gemfile" is required for "allow_failures" option, # see https://docs.travis-ci.com/user/customizing-the-build/#matching-jobs-with-allow_failures gemfile: -script: rubocop matrix: include: @@ -33,11 +32,13 @@ matrix: - rvm: 2.7.1 gemfile: gemfiles/multi_json.gemfile script: + - rubocop - bundle exec rake - bundle exec rspec spec/integration/multi_json - rvm: 2.7.1 gemfile: gemfiles/multi_xml.gemfile script: + - rubocop - bundle exec rake - bundle exec rspec spec/integration/multi_xml - rvm: 2.6.6 From a3a02d713263f4428248d225b2f41390e717c296 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Mon, 31 Aug 2020 21:02:10 +0200 Subject: [PATCH 5/9] Run rubocop once --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c02a82726..688e5ef2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ matrix: - rvm: 2.7.1 script: - bundle exec danger + - rvm: 2.7.1 + script: + - rubocop - rvm: 2.7.1 gemfile: Gemfile - rvm: 2.7.1 @@ -32,13 +35,11 @@ matrix: - rvm: 2.7.1 gemfile: gemfiles/multi_json.gemfile script: - - rubocop - bundle exec rake - bundle exec rspec spec/integration/multi_json - rvm: 2.7.1 gemfile: gemfiles/multi_xml.gemfile script: - - rubocop - bundle exec rake - bundle exec rspec spec/integration/multi_xml - rvm: 2.6.6 From e36bd4b10fba0240b1c9301b8e1d378b52cec362 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Tue, 1 Sep 2020 17:05:45 +0200 Subject: [PATCH 6/9] Update Rakefile --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 4263dd1e6..58788aa82 100644 --- a/Rakefile +++ b/Rakefile @@ -24,4 +24,4 @@ require 'rainbow/ext/string' unless String.respond_to?(:color) require 'rubocop/rake_task' RuboCop::RakeTask.new -task default: :spec +task default: %i[rubocop spec] From 1851ab133d944afe42848ec4af2065435c45245c Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Tue, 1 Sep 2020 17:08:11 +0200 Subject: [PATCH 7/9] Update .travis.yml --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 688e5ef2f..b13a5ae67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,13 @@ sudo: false # see https://docs.travis-ci.com/user/customizing-the-build/#matching-jobs-with-allow_failures gemfile: +script: bundle exec rake spec + matrix: include: - rvm: 2.7.1 script: - bundle exec danger - - rvm: 2.7.1 - script: - - rubocop - rvm: 2.7.1 gemfile: Gemfile - rvm: 2.7.1 @@ -35,12 +34,12 @@ matrix: - rvm: 2.7.1 gemfile: gemfiles/multi_json.gemfile script: - - bundle exec rake + - bundle exec rubocop - bundle exec rspec spec/integration/multi_json - rvm: 2.7.1 gemfile: gemfiles/multi_xml.gemfile script: - - bundle exec rake + - bundle exec rubocop - bundle exec rspec spec/integration/multi_xml - rvm: 2.6.6 gemfile: Gemfile @@ -62,5 +61,6 @@ matrix: - rvm: ruby-head - rvm: jruby-head - rvm: rbx-3 + - rvm: truffleruby-head bundler_args: --without development From f3dcf60b0e9956f076b1058bf3683fa3279344b1 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Tue, 1 Sep 2020 21:53:09 +0200 Subject: [PATCH 8/9] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 609e4235a..0ec4232b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Fixes * Your contribution here. +* [#2099](https://github.com/ruby-grape/grape/pull/2099): Added truffleruby to Travis-CI - [@gogainda](https://github.com/gogainda). * [#2089](https://github.com/ruby-grape/grape/pull/2089): Specify order of mounting Grape with Rack::Cascade in README - [@jonmchan](https://github.com/jonmchan). * [#2083](https://github.com/ruby-grape/grape/pull/2083): Set `Cache-Control` header only for streamed responses - [@stanhu](https://github.com/stanhu). * [#2092](https://github.com/ruby-grape/grape/pull/2092): Correct an example params in Include Missing doc - [@huyvohcmc](https://github.com/huyvohcmc). From 0fc4df0359d8163d365866cf8c9d767b04a17781 Mon Sep 17 00:00:00 2001 From: Igor Victor Date: Tue, 1 Sep 2020 21:54:50 +0200 Subject: [PATCH 9/9] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b13a5ae67..48632523d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,12 +34,10 @@ matrix: - rvm: 2.7.1 gemfile: gemfiles/multi_json.gemfile script: - - bundle exec rubocop - bundle exec rspec spec/integration/multi_json - rvm: 2.7.1 gemfile: gemfiles/multi_xml.gemfile script: - - bundle exec rubocop - bundle exec rspec spec/integration/multi_xml - rvm: 2.6.6 gemfile: Gemfile