From 2474c212d751c3bacf88189e655d6f6cf2deaba6 Mon Sep 17 00:00:00 2001
From: Benjamin Quorning <benjamin@quorning.net>
Date: Fri, 28 Dec 2018 09:57:29 +0100
Subject: [PATCH 1/2] Use just latest Ruby for some jobs
It doesn't specifically need to be 2.5 or 2.6.
---
.circleci/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41832a0c8..184226306 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ rubocop: &rubocop
jobs:
confirm_config_and_documentation:
docker:
- - image: circleci/ruby:2.5
+ - image: circleci/ruby
steps:
- checkout
- run: bundle install
@@ -82,7 +82,7 @@ jobs:
code-climate:
docker:
- - image: circleci/ruby:2.5
+ - image: circleci/ruby
steps:
- checkout
- run: bundle install
From e8f59de2276a74b5338aadeb4405c23d9385a6c9 Mon Sep 17 00:00:00 2001
From: Benjamin Quorning <benjamin@quorning.net>
Date: Fri, 28 Dec 2018 09:58:03 +0100
Subject: [PATCH 2/2] Test on CI also with Ruby 2.6
---
.circleci/config.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 184226306..becf26eb1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,6 +61,16 @@ jobs:
- image: circleci/ruby:2.5
<<: *rubocop
+ # Ruby 2.6
+ ruby-2.6-rspec:
+ docker:
+ - image: circleci/ruby:2.6
+ <<: *rspec
+ ruby-2.6-rubocop:
+ docker:
+ - image: circleci/ruby:2.6
+ <<: *rubocop
+
# JRuby
jruby:
docker:
@@ -121,5 +131,9 @@ workflows:
requires: [confirm_config_and_documentation]
- ruby-2.5-rubocop:
requires: [confirm_config_and_documentation]
+ - ruby-2.6-rspec:
+ requires: [confirm_config_and_documentation]
+ - ruby-2.6-rubocop:
+ requires: [confirm_config_and_documentation]
- jruby
- code-climate