From a946bd85d6d74c8c484c4fb655a9cb0dee3d0067 Mon Sep 17 00:00:00 2001 From: Dennis Lee <4174315-dennisleexyz@users.noreply.gitlab.com> Date: Wed, 8 Jan 2020 20:23:47 +0000 Subject: [PATCH] Use an updated version of ruby With this configuration, it always uses an updated version of ruby and bundler is the one which manages version of the dependencies, hence working in all environments. Before, dependencies could not be satisfied in updated environments because of bundler being too new. --- .gitignore | 3 +- .gitlab-ci.yml | 3 +- 404.html | 25 +++++++++++++ Gemfile | 31 +++++++++++++--- Gemfile.lock | 95 ++++++++++++++++++++++++++++++++++---------------- _config.yml | 50 ++++++++++++++++++++------ about.md | 6 ++-- 7 files changed, 162 insertions(+), 51 deletions(-) create mode 100644 404.html diff --git a/.gitignore b/.gitignore index 45c20ea..f40fbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ _site .sass-cache +.jekyll-cache .jekyll-metadata -public/ +vendor diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 149247e..596a403 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,11 @@ -image: ruby:2.3 +image: ruby:latest variables: JEKYLL_ENV: production LC_ALL: C.UTF-8 before_script: + - gem install bundler - bundle install test: diff --git a/404.html b/404.html new file mode 100644 index 0000000..086a5c9 --- /dev/null +++ b/404.html @@ -0,0 +1,25 @@ +--- +permalink: /404.html +layout: default +--- + + + +
+

404

+ +

Page not found :(

+

The requested page could not be found.

+
diff --git a/Gemfile b/Gemfile index 19e5a19..8e7ddbe 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,30 @@ source "https://rubygems.org" -ruby RUBY_VERSION - +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# # This will help ensure the proper Jekyll version is running. -gem "jekyll", "3.4.0" +# Happy Jekylling! +gem "jekyll", "~> 4.0.0" +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.5" +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins +# If you have any plugins, put them here! +group :jekyll_plugins do + gem "jekyll-feed", "~> 0.12" +end -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem +# and associated library. +install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do + gem "tzinfo", "~> 1.2" + gem "tzinfo-data" +end + +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index 8180833..011cd06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,84 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - ffi (1.9.17) + concurrent-ruby (1.1.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.11.3) forwardable-extended (2.6.0) - jekyll (3.4.0) + http_parser.rb (0.6.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + jekyll (4.0.0) addressable (~> 2.4) colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) + em-websocket (~> 0.5) + i18n (>= 0.9.5, < 2) + jekyll-sass-converter (~> 2.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (~> 3.0) safe_yaml (~> 1.0) - jekyll-sass-converter (1.5.0) - sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.2) - liquid (3.0.6) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + terminal-table (~> 1.8) + jekyll-feed (0.13.0) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (2.0.1) + sassc (> 2.0.1, < 3.0) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (2.1.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - pathutil (0.14.0) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) + public_suffix (4.0.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + rouge (3.14.0) + safe_yaml (1.0.5) + sassc (2.2.1) + ffi (~> 1.9) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + tzinfo-data (1.2019.3) + tzinfo (>= 1.0.0) + unicode-display_width (1.6.0) + wdm (0.1.1) PLATFORMS ruby DEPENDENCIES - jekyll (= 3.4.0) + jekyll (~> 4.0.0) + jekyll-feed (~> 0.12) + minima (~> 2.5) + tzinfo (~> 1.2) tzinfo-data - -RUBY VERSION - ruby 2.3.1p112 + wdm (~> 0.1.1) BUNDLED WITH - 1.13.6 + 2.0.2 diff --git a/_config.yml b/_config.yml index 6ffe686..af3c768 100644 --- a/_config.yml +++ b/_config.yml @@ -1,26 +1,56 @@ # Welcome to Jekyll! # # This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely need to edit after that. +# which you are expected to set up once and rarely edit after that. If you find +# yourself editing this file very often, consider using Jekyll's data files +# feature for the data you need to update frequently. +# # For technical reasons, this file is *NOT* reloaded automatically when you use -# 'jekyll serve'. If you change this file, please restart the server process. - +# 'bundle exec jekyll serve'. If you change this file, please restart the server process. +# +# If you need help with YAML syntax, here are some quick references for you: +# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml +# https://learnxinyminutes.com/docs/yaml/ +# # Site settings +# These are used to personalize your new site. If you look in the HTML files, +# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. +# You can create any custom variable you would like, and they will be accessible +# in the templates via {{ site.myvariable }}. + title: Example Jekyll site using GitLab Pages email: your-email@domain.com -description: > # this means to ignore newlines until "baseurl:" +description: >- # this means to ignore newlines until "baseurl:" Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description. baseurl: "/jekyll" # the subpath of your site, e.g. /blog -url: "/" # the base hostname & protocol for your site +url: "/" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: jekyllrb github_username: jekyll gitlab_username: pages -# Outputting -permalink: /:categories/:year/:month/:day/:title - # Build settings -markdown: kramdown -exclude: ["README.md"] \ No newline at end of file +theme: minima +plugins: + - jekyll-feed + +# Exclude from processing. +# The following items will not be processed, by default. +# Any item listed under the `exclude:` key here will be automatically added to +# the internal "default list". +# +# Excluded items can be processed by explicitly listing the directories or +# their entries' file path in the `include:` list. +# +# exclude: +# - .sass-cache/ +# - .jekyll-cache/ +# - gemfiles/ +# - Gemfile +# - Gemfile.lock +# - node_modules/ +# - vendor/bundle/ +# - vendor/cache/ +# - vendor/gems/ +# - vendor/ruby/ diff --git a/about.md b/about.md index d0e6de5..d441cde 100644 --- a/about.md +++ b/about.md @@ -4,11 +4,11 @@ title: About permalink: /about/ --- -This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/) +This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/) You can find the source code for the Jekyll new theme at: -{% include icon-github.html username="jglovier" %} / -[jekyll-new](https://github.com/jglovier/jekyll-new) +{% include icon-github.html username="jekyll" %} / +[minima](https://github.com/jekyll/minima) You can find the source code for Jekyll at {% include icon-github.html username="jekyll" %} /