diff options
| author | Daigo 3 Dango <zunda@users.noreply.github.com> | 2021-07-09 23:29:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-10 01:29:27 +0200 |
| commit | 3d5183e99c851ef97107407ec0f85fe9e31240bf (patch) | |
| tree | a5d2aee2455b5551bac9c93ce8bd139bdd40b2ad | |
| parent | c4568e3b606cc4007739f881c334bdfe8dc77745 (diff) | |
Use ruby-2.7.4 (#16481)
Stop using older version of resolv gem as the bug has been fixed. https://bugs.ruby-lang.org/issues/17781
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/.ruby-version b/.ruby-version index 37c2961c2..a4dd9dba4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +2.7.4 diff --git a/Dockerfile b/Dockerfile index 962e5a8c9..8279e8735 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN ARCH= && \ mv node-v$NODE_VER-linux-$ARCH /opt/node # Install Ruby -ENV RUBY_VER="2.7.2" +ENV RUBY_VER="2.7.4" RUN apt-get update && \ apt-get install -y --no-install-recommends build-essential \ bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \ diff --git a/Gemfile b/Gemfile index a76e69ac3..e80312047 100644 --- a/Gemfile +++ b/Gemfile @@ -155,5 +155,3 @@ gem 'concurrent-ruby', require: false gem 'connection_pool', require: false gem 'xorcist', '~> 1.1' - -gem 'resolv', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 96d89fbae..6ebdd67a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -491,7 +491,6 @@ GEM regexp_parser (2.1.1) request_store (1.5.0) rack (>= 1.4) - resolv (0.1.0) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) @@ -764,7 +763,6 @@ DEPENDENCIES rdf-normalize (~> 0.4) redis (~> 4.3) redis-namespace (~> 1.8) - resolv (~> 0.1.0) rqrcode (~> 2.0) rspec-rails (~> 5.0) rspec-sidekiq (~> 3.1) |