From d9b7d777e406cbc74a5d0d576c1c1b10e10950f6 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Sat, 7 Jul 2018 15:24:45 +0200 Subject: [PATCH 1/5] README: Add comments about running the dev-site on Windows --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 2ad80ee..fb513f2 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,15 @@ You need docker-compose. Simply run You can now see the site at [localhost:4000](http://localhost:4000) +### Or install Jekyll localy on Windows + +If using Ruby >=2.5 be sure to remove version numbers from dependency +Gemfile gems and remember to also delete Gemfile.lock compiling +Jekyll site. + +You will also need to recompile the gem 'eventmachine' locally. +`gem install --platform ruby eventmachine` + ## Deploy If not using Docker, it's **important** that you build the site with `JEKYLL_ENV=production bundle exec jekyll build` before deploying the contents of the `_site` directory. We're doing some debugging stuff when the project is build in the development env. -- 2.43.4 From 000be3d6dab3d5de7890e54df1e25463ad89e538 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Sat, 7 Jul 2018 15:06:35 +0200 Subject: [PATCH 2/5] Add Gemfile.lock to .gitignore --- .gitignore | 3 ++- Gemfile.lock | 52 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 59d6246..d534e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ _site .sass-cache .jekyll-metadata -_scripts/config.sh \ No newline at end of file +_scripts/config.sh +Gemfile\.lock diff --git a/Gemfile.lock b/Gemfile.lock index 2130c31..5393c11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,68 +6,80 @@ GEM autoprefixer-rails (6.3.7) execjs colorator (1.1.0) + concurrent-ruby (1.0.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.7-x64-mingw32) execjs (2.7.0) - ffi (1.9.18) + ffi (1.9.25-x64-mingw32) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - jekyll (3.6.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) + jekyll-watch (~> 2.0) kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 3) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) jekyll-autoprefixer (1.0.1) autoprefixer-rails (~> 6.3.6) - jekyll-feed (0.9.2) + jekyll-feed (0.10.0) jekyll (~> 3.3) jekyll-livereload (0.2.2) em-websocket (~> 0.5) jekyll (~> 3.0) jekyll-polyglot (1.3.1) jekyll (>= 3.0) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (1.5.1) + jekyll-watch (2.0.0) listen (~> 3.0) - kramdown (1.14.0) + kramdown (1.17.0) liquid (4.0.0) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.10.2) + public_suffix (3.0.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (2.2.1) + rouge (3.1.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + tzinfo-data (1.2018.5) + tzinfo (>= 1.0.0) PLATFORMS - ruby + x64-mingw32 DEPENDENCIES - jekyll (~> 3.6.2) + jekyll jekyll-autoprefixer - jekyll-feed (~> 0.6) + jekyll-feed jekyll-livereload jekyll-polyglot tzinfo-data BUNDLED WITH - 1.16.1 + 1.16.2 -- 2.43.4 From ddcc03ba78614fdcec1567473a7cc94b9c1f1488 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Sat, 7 Jul 2018 15:21:24 +0200 Subject: [PATCH 3/5] Gemfile: Add gem wdm --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 6a3f80a..f37b1a7 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,7 @@ group :jekyll_plugins do gem "jekyll-livereload" gem "jekyll-polyglot" gem "jekyll-autoprefixer" + gem "wdm" end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -- 2.43.4 From b181a936b7c1d9322de45ab751de4ad1ab8dac1b Mon Sep 17 00:00:00 2001 From: Christoffer Date: Sat, 7 Jul 2018 15:22:37 +0200 Subject: [PATCH 4/5] Gemfile: Remove version dependency jekyll-feed --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f37b1a7..322a55b 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "jekyll", "~> 3.6.2" # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" + gem "jekyll-feed" gem "jekyll-livereload" gem "jekyll-polyglot" gem "jekyll-autoprefixer" -- 2.43.4 From d8e60f4ff544006f30ca68c9ca3a10e4fe658203 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Sat, 7 Jul 2018 15:23:02 +0200 Subject: [PATCH 5/5] Gemfile: Remove version dependency for Jekyll --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 322a55b..3282c7f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.6.2" +gem "jekyll" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. -- 2.43.4