From 9222ea0cf67a175dd42958d0024382e8c0f89320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 9 Aug 2021 00:57:56 +0200 Subject: [PATCH] Upgrade Ruby to version 2.6.8 So get the latest security fixes in the 2.6.x series and we can update the parser gem without getting any warnings. --- .gitlab-ci.yml | 4 ++-- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile.lock | 2 +- README.md | 2 +- README_ES.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6489bc0e7..fd052c819 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - lint tests: - image: "ruby:2.6.7" + image: "ruby:2.6.8" stage: test services: - postgres:10.10 @@ -34,7 +34,7 @@ tests: # PRONTO_GITLAB_API_PRIVATE_TOKEN to your repository CI/CD settings # giving it the value of the Personal Access Token linters: - image: "ruby:2.6.7" + image: "ruby:2.6.8" stage: lint cache: key: consul diff --git a/.ruby-version b/.ruby-version index e261122d5..743af5e12 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.7 +2.6.8 diff --git a/Dockerfile b/Dockerfile index ce8b96c01..5ec8e1468 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.7 +FROM ruby:2.6.8 ENV DEBIAN_FRONTEND noninteractive diff --git a/Gemfile.lock b/Gemfile.lock index b0afd9e3d..9f0de169b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,7 +423,7 @@ GEM parallel (1.19.2) paranoia (2.4.2) activerecord (>= 4.0, < 6.1) - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.0.0) pg_search (2.3.5) diff --git a/README.md b/README.md index 1f562a114..06689b681 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ You can access the main website of the project at [http://consulproject.org](htt **NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org) -Prerequisites: install git, Ruby 2.6.7, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5). +Prerequisites: install git, Ruby 2.6.8, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5). ```bash git clone https://github.com/consul/consul.git diff --git a/README_ES.md b/README_ES.md index 9b4a4d890..dbef26e87 100644 --- a/README_ES.md +++ b/README_ES.md @@ -36,7 +36,7 @@ Puedes acceder a la página principal del proyecto en [http://consulproject.org] **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org) -Prerequisitos: tener instalado git, Ruby 2.6.7, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior). +Prerequisitos: tener instalado git, Ruby 2.6.8, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior). ```bash git clone https://github.com/consul/consul.git