From e32aa26b3f0e645716b098d33a80a9e31667c1fe Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 18:38:33 +0000 Subject: Setup GitLab pages --- .gitlab-ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..8d03a52 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,25 @@ +# This file is a template, and might need editing before it works on your project. +# Full project: https://gitlab.com/pages/jekyll +image: ruby:2.3 + +test: + stage: test + script: + - gem install jekyll + - jekyll build -d test + artifacts: + paths: + - test + except: + - master + +pages: + stage: deploy + script: + - gem install jekyll + - jekyll build -d public + artifacts: + paths: + - public + only: + - master -- cgit v1.1 From b09fb25e2e610aa42ba563774065cad8daa5dd6c Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 18:45:17 +0000 Subject: Delete Gemfile.lock --- Gemfile.lock | 56 -------------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b41197d..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,56 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - colorator (1.1.0) - ffi (1.9.14) - forwardable-extended (2.6.0) - jekyll (3.3.0) - addressable (~> 2.4) - colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (~> 1.7) - safe_yaml (~> 1.0) - jekyll-feed (0.8.0) - jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) - sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.1) - liquid (3.0.6) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - mercenary (0.3.6) - minima (2.1.0) - jekyll (~> 3.3) - pathutil (0.14.0) - forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) - -PLATFORMS - ruby - -DEPENDENCIES - jekyll (= 3.3.0) - jekyll-feed (~> 0.6) - minima (~> 2.0) - -RUBY VERSION - ruby 2.3.1p112 - -BUNDLED WITH - 1.13.2 -- cgit v1.1 From a38d79f599a676d702c5634736ed95a338d3fd14 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 18:45:29 +0000 Subject: Delete Gemfile --- Gemfile | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 Gemfile diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 3056ccc..0000000 --- a/Gemfile +++ /dev/null @@ -1,24 +0,0 @@ -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. -# Happy Jekylling! -gem "jekyll", "3.3.0" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -# 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.6" -end -- cgit v1.1 From 5e6e4675b938668bba9bd10b6c39ede1897fd825 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:27:52 +0000 Subject: Revert "Delete Gemfile.lock" This reverts commit b09fb25e2e610aa42ba563774065cad8daa5dd6c --- Gemfile.lock | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..b41197d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,56 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + colorator (1.1.0) + ffi (1.9.14) + forwardable-extended (2.6.0) + jekyll (3.3.0) + addressable (~> 2.4) + colorator (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (~> 1.7) + safe_yaml (~> 1.0) + jekyll-feed (0.8.0) + jekyll (~> 3.3) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.13.1) + liquid (3.0.6) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + minima (2.1.0) + jekyll (~> 3.3) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + public_suffix (2.0.5) + rb-fsevent (0.9.8) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rouge (1.11.1) + safe_yaml (1.0.4) + sass (3.4.23) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll (= 3.3.0) + jekyll-feed (~> 0.6) + minima (~> 2.0) + +RUBY VERSION + ruby 2.3.1p112 + +BUNDLED WITH + 1.13.2 -- cgit v1.1 From 201544c7397b209f6ded4023068fba2309323077 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:28:27 +0000 Subject: Revert "Delete Gemfile" This reverts commit a38d79f599a676d702c5634736ed95a338d3fd14 --- Gemfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..3056ccc --- /dev/null +++ b/Gemfile @@ -0,0 +1,24 @@ +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. +# Happy Jekylling! +gem "jekyll", "3.3.0" + +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.0" + +# 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.6" +end -- cgit v1.1 From b827c54eba3d239db94b56c4afa3acaa77956aeb Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:29:23 +0000 Subject: Update .gitlab-ci.yml --- .gitlab-ci.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d03a52..f7736c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,28 @@ -# This file is a template, and might need editing before it works on your project. -# Full project: https://gitlab.com/pages/jekyll -image: ruby:2.3 +image: ruby:2.3 # Use Ruby Docker image + +cache: # Add Bundler cache to 'vendor' directory + paths: + - vendor/ + +before_script: # Install Gems to 'vendor' directory + - bundle install --path vendor test: stage: test - script: - - gem install jekyll - - jekyll build -d test - artifacts: + script: # Generate test site(s) into 'test' directory + - bundle exec jekyll build -d test + artifacts: # Save a zipped version for download paths: - test - except: + except: # Execute for all branches except master - master pages: stage: deploy - script: - - gem install jekyll - - jekyll build -d public - artifacts: + script: # Generate public site and deploy + - bundle exec jekyll build -d public + artifacts: # Save a zipped version for download paths: - public - only: - - master + only: # Only deploy the master branch + - master \ No newline at end of file -- cgit v1.1 From 55ae09d46013bfdcf988c225df154e6b0a3558ce Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:34:24 +0000 Subject: Update .gitlab-ci.yml --- .gitlab-ci.yml | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7736c5..00e3259 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,28 +1,11 @@ -image: ruby:2.3 # Use Ruby Docker image - -cache: # Add Bundler cache to 'vendor' directory - paths: - - vendor/ - -before_script: # Install Gems to 'vendor' directory - - bundle install --path vendor - -test: - stage: test - script: # Generate test site(s) into 'test' directory - - bundle exec jekyll build -d test - artifacts: # Save a zipped version for download - paths: - - test - except: # Execute for all branches except master - - master +image: ruby:2.3 pages: - stage: deploy - script: # Generate public site and deploy - - bundle exec jekyll build -d public - artifacts: # Save a zipped version for download + script: + - gem install jekyll + - jekyll build -d public + artifacts: paths: - public - only: # Only deploy the master branch + only: - master \ No newline at end of file -- cgit v1.1 From 7a66a2938c7ed7dd2fd476ff1fae452f5bf16a72 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:51:25 +0000 Subject: Update _config.yml --- _config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_config.yml b/_config.yml index 4e8e9d6..9dfba6e 100644 --- a/_config.yml +++ b/_config.yml @@ -20,11 +20,6 @@ url: "http://noahloomans.com" # the base hostname & protocol for your site, e.g. # Build settings markdown: kramdown -gems: - - jekyll-feed -exclude: - - Gemfile - - Gemfile.lock sass: sass_dir: style \ No newline at end of file -- cgit v1.1 From fa2f5a60d23785062e2f4852e8933dff95765a04 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:51:41 +0000 Subject: Delete Gemfile --- Gemfile | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 Gemfile diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 3056ccc..0000000 --- a/Gemfile +++ /dev/null @@ -1,24 +0,0 @@ -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. -# Happy Jekylling! -gem "jekyll", "3.3.0" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -# 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.6" -end -- cgit v1.1 From 40ecf806f649763e0cea002619563f8aecaa5f8c Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 5 Jan 2017 19:51:51 +0000 Subject: Delete Gemfile.lock --- Gemfile.lock | 56 -------------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b41197d..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,56 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - colorator (1.1.0) - ffi (1.9.14) - forwardable-extended (2.6.0) - jekyll (3.3.0) - addressable (~> 2.4) - colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (~> 1.7) - safe_yaml (~> 1.0) - jekyll-feed (0.8.0) - jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) - sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.1) - liquid (3.0.6) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - mercenary (0.3.6) - minima (2.1.0) - jekyll (~> 3.3) - pathutil (0.14.0) - forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) - -PLATFORMS - ruby - -DEPENDENCIES - jekyll (= 3.3.0) - jekyll-feed (~> 0.6) - minima (~> 2.0) - -RUBY VERSION - ruby 2.3.1p112 - -BUNDLED WITH - 1.13.2 -- cgit v1.1