diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff28e2ffc..91d0e3c9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - lint tests: - image: "ruby:2.7.7" + image: "ruby:3.0.6" 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.7.7" + image: "ruby:3.0.6" stage: lint cache: key: consul diff --git a/.ruby-version b/.ruby-version index 1f7da99d4..818bd47ab 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.0.6 diff --git a/Dockerfile b/Dockerfile index 51385915f..dee67825a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.7-buster +FROM ruby:3.0.6-buster ENV DEBIAN_FRONTEND noninteractive diff --git a/Gemfile.lock b/Gemfile.lock index b1360ecad..c3f5571f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,11 @@ +GEM + remote: https://rails-assets.org/ + specs: + rails-assets-leaflet (1.5.1) + rails-assets-markdown-it (9.0.1) + GEM remote: https://rubygems.org/ - remote: https://rails-assets.org/ specs: actioncable (6.0.6.1) actionpack (= 6.0.6.1) @@ -457,8 +462,6 @@ GEM bundler (>= 1.3.0) railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) - rails-assets-leaflet (1.5.1) - rails-assets-markdown-it (9.0.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -768,4 +771,4 @@ DEPENDENCIES wkhtmltopdf-binary (~> 0.12.6) BUNDLED WITH - 2.1.4 + 2.2.33 diff --git a/README.md b/README.md index 538dad4f9..129822757 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.7.7, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5). +Prerequisites: install git, Ruby 3.0.6, 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 5b38cd251..6035c83a6 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.7.7, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior). +Prerequisitos: tener instalado git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior). ```bash git clone https://github.com/consul/consul.git