From b70600c15bf927bf5cad42b5212bd2e5022991a2 Mon Sep 17 00:00:00 2001 From: Evan Read Date: Tue, 3 May 2022 15:18:32 +1000 Subject: Always use version of Bundler set in Gemfile.lock Also regenerate Gemfile.lock. --- .gitlab-ci.yml | 4 +++- Gemfile.lock | 26 +++++++++++++------------- dockerfiles/Dockerfile.gitlab-docs-base | 3 +++ dockerfiles/Dockerfile.gitlab-docs-lint-html | 4 ++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1eef1539..607dd96d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,11 @@ default: image: registry.gitlab.com/gitlab-org/gitlab-docs:base tags: - gitlab-org - # Check Ruby version and install gems + # Check Ruby, RubyGems, and Bundler versions and install gems before_script: - ruby -v + - gem -v + - bundle -v - bundle config set path 'vendor' - NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 diff --git a/Gemfile.lock b/Gemfile.lock index 3ba62a08..94a200b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.2.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -30,7 +30,7 @@ GEM coderay (1.1.3) colored (1.2) colored2 (3.1.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) cork (0.3.0) colored2 (~> 3.1) cri (2.15.11) @@ -99,7 +99,7 @@ GEM rubocop-performance (~> 1.9.2) rubocop-rails (~> 2.9) rubocop-rspec (~> 1.44) - gitlab_kramdown (0.18.0) + gitlab_kramdown (0.19.0) asciidoctor-plantuml (= 0.0.15) kramdown (~> 2.3.0) nokogiri (~> 1.13.0) @@ -121,7 +121,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - memo_wise (1.6.0) + memo_wise (1.7.0) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) @@ -169,15 +169,15 @@ GEM nanoc-core (~> 4.11, >= 4.11.14) nap (1.1.0) no_proxy_fix (0.1.2) - nokogiri (1.13.3) + nokogiri (1.13.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - parallel (1.21.0) - parser (3.1.1.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) pastel (0.8.0) tty-color (~> 0.5) @@ -198,7 +198,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) - regexp_parser (2.2.1) + regexp_parser (2.3.1) rexml (3.2.5) rouge (3.28.0) rspec (3.11.0) @@ -210,7 +210,7 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) @@ -223,11 +223,11 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.13.0) + rubocop-graphql (0.14.2) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -271,7 +271,7 @@ DEPENDENCIES builder (~> 3.2.0) gitlab-dangerfiles (~> 3.1.0) gitlab-styles (~> 7.0.0) - gitlab_kramdown (~> 0.18.0) + gitlab_kramdown (~> 0.19.0) highline (~> 2.0.0) nanoc (~> 4.12.0) nanoc-live @@ -282,4 +282,4 @@ DEPENDENCIES sassc (~> 2.4.0) BUNDLED WITH - 2.1.4 + 2.3.13 diff --git a/dockerfiles/Dockerfile.gitlab-docs-base b/dockerfiles/Dockerfile.gitlab-docs-base index 476f1656..e079591c 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-base +++ b/dockerfiles/Dockerfile.gitlab-docs-base @@ -30,3 +30,6 @@ RUN apk add --no-cache -U \ # Do not install rdoc to save some space RUN echo 'gem: --no-document' >> /etc/gemrc + +# Update RubyGems +gem update --system 3.3.13 diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint-html b/dockerfiles/Dockerfile.gitlab-docs-lint-html index 8704f0cb..fd9261cf 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint-html +++ b/dockerfiles/Dockerfile.gitlab-docs-lint-html @@ -38,6 +38,9 @@ RUN apk add --no-cache -U \ # Do not install rdoc to save some space RUN echo 'gem: --no-document' >> /etc/gemrc +# Update RubyGems +gem update --system 3.3.13 + # Set up needed environment variables that are called with --build-arg when # the Docker image is built (see .gitlab-ci.yml). ARG CI_COMMIT_REF_NAME @@ -53,6 +56,7 @@ RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME RUN cd gitlab-docs \ && yarn install --frozen-lockfile \ + && bundle update --bundler \ && NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 RUN yarn cache clean --all -- cgit v1.2.3