From 3ce39559b24ac077e8c463212743598b56240f13 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 13 May 2022 22:07:45 +0200 Subject: [PATCH] update Ruby to 2.6.10, fix Gemfile and push Gemfile.lock Signed-off-by: CrazyMax --- .dockerignore | 7 +---- .gitignore | 2 +- .ruby-version | 2 +- Gemfile | 49 +++++--------------------------- Gemfile.lock | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 50 deletions(-) create mode 100644 Gemfile.lock diff --git a/.dockerignore b/.dockerignore index 256a36839e..0ca8aaa66b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,9 +1,7 @@ -.dockerignore .DS_Store .git .github .gitignore -.gitmodules .idea .jekyll-metadata .sass-cache @@ -11,9 +9,6 @@ tests _site CONTRIBUTING.md Dockerfile -Dockerfile.archive docker-compose.yml -Gemfile -Gemfile.lock _website*.json - +/vendor diff --git a/.gitignore b/.gitignore index 010dcf6657..52ae55e394 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,5 @@ _site/** .sass-cache/** CNAME -Gemfile.lock _kbase/** +/vendor diff --git a/.ruby-version b/.ruby-version index e75da3e63d..a04abec914 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.6 +2.6.10 diff --git a/Gemfile b/Gemfile index f5ffef68d3..18df52ad12 100644 --- a/Gemfile +++ b/Gemfile @@ -1,43 +1,8 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -# Update me once in a while: https://github.com/github/pages-gem/releases -# Please ensure, before upgrading, that this version exists as a tag in starefossen/github-pages here: -# https://hub.docker.com/r/starefossen/github-pages/tags/ -# -# Fresh install? -# -# Windows: -# Install Ruby 2.3.3 x64 and download the Development Kit for 64-bit: -# https://rubyinstaller.org/downloads/ -# -# Run this to install devkit after extracting: -# ruby /dk.rb init -# ruby /dk.rb install -# -# then: -# gem install bundler -# bundle install -# -# Mac/Linux: -# Install Ruby 2.3.x and then: -# gem install bundler -# bundle install -# -# --------------------- -# Upgrading? Probably best to reset your environment: -# -# Remove all gems: -# gem uninstall -aIx -# -# (If Windows, do the dk.rb bits above, then go to the next step below) - -# Install anew: -# gem install bundler -# bundle install - -# This only affects interactive builds (local build, Netlify) and not the -# live site deploy, which uses the Dockerfiles found in the publish-tools -# branch. - -gem "github-pages", "198" -gem 'wdm' if Gem.win_platform? +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'wdm', '>= 0.1.0' if Gem.win_platform? +gem 'jekyll' +gem 'jekyll-redirect-from' +gem 'jekyll-relative-links' +gem 'jekyll-sitemap' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..588ff7a64d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,79 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + colorator (1.1.0) + concurrent-ruby (1.1.10) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.15.5) + forwardable-extended (2.6.0) + http_parser.rb (0.8.0) + i18n (1.10.0) + concurrent-ruby (~> 1.0) + jekyll (4.2.2) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (~> 2.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (~> 0.4.0) + pathutil (~> 0.9) + rouge (~> 3.0) + safe_yaml (~> 1.0) + terminal-table (~> 2.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-sass-converter (2.2.0) + sassc (> 2.0.1, < 3.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (4.0.7) + rb-fsevent (0.11.1) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.5) + rouge (3.28.0) + safe_yaml (1.0.5) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.8.0) + +PLATFORMS + aarch64-linux + arm-linux + x86_64-linux + +DEPENDENCIES + jekyll + jekyll-redirect-from + jekyll-relative-links + jekyll-sitemap + tzinfo-data + +BUNDLED WITH + 2.3.13