From 86218336b2878ea49b6fdad98108c1285937d79b Mon Sep 17 00:00:00 2001 From: caubet_m Date: Thu, 1 Feb 2024 10:51:45 +0100 Subject: [PATCH] Pipeline fix attempt v1 --- .gitlab-ci.yml | 4 +-- Dockerfile | 5 ++-- Gemfile | 14 ++++----- Gemfile.lock | 81 +++++++++++++++++++++++++------------------------- 4 files changed, 51 insertions(+), 53 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f8c14a..aa61ad3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - test - deploy -image: alpine:latest +image: alpine:3.13 variables: JEKYLL_ENV: production @@ -15,7 +15,7 @@ before_script: libxslt libxslt-dev zlib-dev zlib ruby ruby-dev yaml yaml-dev libffi-dev build-base git nodejs - - gem install etc bundler --no-document + - gem install bundler -v 2.3.26 - pwd - ls -l - bundle install diff --git a/Dockerfile b/Dockerfile index b27ff9a..f67e513 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.13 WORKDIR /tmp ADD Gemfile /tmp/ @@ -11,7 +11,8 @@ RUN apk list -I && \ ruby ruby-dev yaml yaml-dev \ libffi-dev build-base git nodejs RUN gem env -RUN gem install etc bundler --no-document +RUN gem install etc --no-document +RUN gem install bundler -v 2.3.26 RUN pwd RUN ls -l RUN bundle install diff --git a/Gemfile b/Gemfile index f8147e9..c4e9e6b 100644 --- a/Gemfile +++ b/Gemfile @@ -12,14 +12,12 @@ gem "webrick", "~> 1.7.0" gem "etc", "~> 1.2.0" gem "bigdecimal", "~> 1.4" gem 'eventmachine', "~> 1.2.7" -# gem 'faraday', "~> 1.4.3" -# gem 'addressable', "~> 2.7.0" -# gem 'faraday-net_http_persistent', "~> 1.1.0" -# gem 'nokogiri', '~> 1.11', '>= 1.11.7' -# gem 'ruby2_keywords', "~> 0.0.4" -# gem 'rubyzip', "~> 2.3.0" - +gem 'faraday', "~> 1.4.3" +gem 'addressable', "~> 2.7.0" +gem 'faraday-net_http_persistent', "~> 1.1.0" +gem 'ruby2_keywords', "~> 0.0.4" +gem 'rubyzip', "~> 2.3.0" +# gem 'ffi', "~> 1.15.3" gem 'http_parser.rb', "~> 0.6.0" # requires mkdir in /usr/bin/mkdir gem "jekyll", "~> 3.9.0" - diff --git a/Gemfile.lock b/Gemfile.lock index a73f123..5e5a27a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.4) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) + addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) bigdecimal (1.4.4) coffee-script (2.4.1) @@ -17,35 +17,31 @@ GEM colorator (1.1.0) commonmarker (0.17.13) ruby-enum (~> 0.5) - concurrent-ruby (1.1.9) - dnsruby (1.61.7) - simpleidn (~> 0.1) - em-websocket (0.5.2) + concurrent-ruby (1.2.3) + dnsruby (1.70.0) + simpleidn (~> 0.2.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) etc (1.2.0) - ethon (0.14.0) + ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.8.1) - faraday (1.5.1) + execjs (2.9.1) + faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - ffi (1.15.3) + faraday-net_http_persistent (1.1.0) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) github-pages (215) @@ -98,7 +94,7 @@ GEM octokit (~> 4.0) public_suffix (>= 2.0.2, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -210,39 +206,37 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - json (2.5.1) + json (2.7.1) kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.5.3) + mini_portile2 (2.8.5) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.4) - multipart-post (2.1.1) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + minitest (5.21.2) + multipart-post (2.3.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.11.7-x86_64-linux) - racc (~> 1.4) - octokit (4.21.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.5.2) - rb-fsevent (0.11.0) + public_suffix (4.0.7) + racc (1.7.3) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) + rexml (3.2.6) rouge (3.26.0) ruby-enum (0.9.0) i18n @@ -254,40 +248,45 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.9.1) + unicode-display_width (1.8.0) webrick (1.7.0) - zeitwerk (2.4.2) + zeitwerk (2.6.12) PLATFORMS ruby x86_64-linux DEPENDENCIES + addressable (~> 2.7.0) bigdecimal (~> 1.4) etc (~> 1.2.0) eventmachine (~> 1.2.7) + faraday (~> 1.4.3) + faraday-net_http_persistent (~> 1.1.0) ffi (~> 1.15.3) github-pages (~> 215) http_parser.rb (~> 0.6.0) jekyll (~> 3.9.0) jekyll-redirect-from (~> 0.16.0) json (~> 2.2) + ruby2_keywords (~> 0.0.4) + rubyzip (~> 2.3.0) webrick (~> 1.7.0) BUNDLED WITH - 2.2.21 + 2.3.26