From 1b84bbd1a5baa3368a346c349ee55f3c01c47f1a Mon Sep 17 00:00:00 2001 From: Callum Stott Date: Tue, 19 Mar 2019 11:49:07 +0000 Subject: [PATCH] Use Ruby version supported by CF buildpack --- .tool-versions | 2 +- api/.ruby-version | 2 +- api/Gemfile | 2 +- api/Gemfile.lock | 2 +- docker/dev/Dockerfile | 2 +- e2e/.ruby-version | 2 +- e2e/Gemfile | 2 +- e2e/Gemfile.lock | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.tool-versions b/.tool-versions index 787f7c4..ef9f713 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ nodejs 11.6.0 -ruby 2.6.2 +ruby 2.6.1 diff --git a/api/.ruby-version b/api/.ruby-version index 097a15a..6a6a3d8 100644 --- a/api/.ruby-version +++ b/api/.ruby-version @@ -1 +1 @@ -2.6.2 +2.6.1 diff --git a/api/Gemfile b/api/Gemfile index 2b5488d..f8ab647 100644 --- a/api/Gemfile +++ b/api/Gemfile @@ -30,7 +30,7 @@ # source 'https://rubygems.org' -ruby '2.6.2' +ruby '2.6.1' gem 'rails', '5.2.1.1' diff --git a/api/Gemfile.lock b/api/Gemfile.lock index 4273a31..518e035 100644 --- a/api/Gemfile.lock +++ b/api/Gemfile.lock @@ -346,7 +346,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 2.6.2p47 + ruby 2.6.1p33 BUNDLED WITH 1.16.2 diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 9ce8517..336c273 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -12,7 +12,7 @@ RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv && echo 'export PATH=" RUN git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build ENV PATH $PATH:/root/.rbenv/bin:/root/.rbenv/shims RUN cd /root/.rbenv/plugins/ruby-build && git pull && cd - -RUN rbenv install 2.6.2 && rbenv global 2.6.2 && rbenv rehash +RUN rbenv install 2.6.1 && rbenv global 2.6.1 && rbenv rehash RUN echo 'gem: --no-rdoc --no-ri' >> /.gemrc RUN gem install bundler diff --git a/e2e/.ruby-version b/e2e/.ruby-version index 097a15a..6a6a3d8 100644 --- a/e2e/.ruby-version +++ b/e2e/.ruby-version @@ -1 +1 @@ -2.6.2 +2.6.1 diff --git a/e2e/Gemfile b/e2e/Gemfile index b768021..973e907 100644 --- a/e2e/Gemfile +++ b/e2e/Gemfile @@ -30,7 +30,7 @@ # source 'https://rubygems.org' -ruby '2.6.2' +ruby '2.6.1' group :development, :test do gem 'rspec' diff --git a/e2e/Gemfile.lock b/e2e/Gemfile.lock index 08f3cc4..9337b80 100644 --- a/e2e/Gemfile.lock +++ b/e2e/Gemfile.lock @@ -67,7 +67,7 @@ DEPENDENCIES selenium-webdriver RUBY VERSION - ruby 2.6.2p47 + ruby 2.6.1p33 BUNDLED WITH 1.16.2