From a696edb49ca156a04ce36b32cb68b2fa3e0701de Mon Sep 17 00:00:00 2001 From: James Mead <3169+floehopper@users.noreply.github.com> Date: Thu, 22 Nov 2018 21:10:22 +0000 Subject: [PATCH 1/3] Use branch of jekyll-sass-converter to fix deprecation warning This fixes the deprecation warning (see below) which appears on running a fresh `bundle install`. This branch contains the changes described in this PR [1]. The only outstanding problems seem to be Windows-related, so I think it's safe to use it. We should be able to switch back to the release version (required by default by the jekyll gem) when this PR is merged and released. Ruby Sass is deprecated and will be unmaintained as of 26 March 2019. * If you use Sass as a command-line tool, we recommend using Dart Sass, the new primary implementation: https://sass-lang.com/install * If you use Sass as a plug-in for a Ruby web framework, we recommend using the sassc gem: https://github.com/sass/sassc-ruby#readme * For more details, please refer to the Sass blog: http://sass.logdown.com/posts/7081811 [1]: https://github.com/jekyll/jekyll-sass-converter/pull/75 --- Gemfile | 3 +++ Gemfile.lock | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index e8a7006..caeca37 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source 'https://rubygems.org' gem 'jekyll' + +# Fixes deprecation warning - see https://github.com/jekyll/jekyll-sass-converter/pull/75 +gem 'jekyll-sass-converter', git: 'https://github.com/jekyll/jekyll-sass-converter.git', branch: 'sassc' diff --git a/Gemfile.lock b/Gemfile.lock index ec25974..cce78c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/jekyll/jekyll-sass-converter.git + revision: c4d4e3e5b1a2222bb94895f9a6ab7e0216236ab8 + branch: sassc + specs: + jekyll-sass-converter (1.5.2) + sassc (~> 2.0) + GEM remote: https://rubygems.org/ specs: @@ -27,8 +35,6 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) jekyll-watch (2.1.2) listen (~> 3.0) kramdown (1.17.0) @@ -41,23 +47,23 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (2.0.5) + rake (12.3.1) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (2.2.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.6.0) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.0.0) + ffi (~> 1.9.6) + rake PLATFORMS ruby DEPENDENCIES jekyll + jekyll-sass-converter! BUNDLED WITH 1.17.1 From fce5d8bbc1033de0e783a5508a9f82cda6278668 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Thu, 29 Nov 2018 12:49:27 +0000 Subject: [PATCH 2/3] rsync to dev.static.coops.tech --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4a9b54..20fd812 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,10 @@ pages: script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ + - cd public + - git checkout dev + - cd .. + - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ artifacts: paths: - public From 37c2d2cfe81403977eee2fe9849156136762ce32 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Thu, 29 Nov 2018 14:47:18 +0000 Subject: [PATCH 3/3] rsync dev branch --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20fd812..223deaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,9 +29,8 @@ pages: script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ - - cd public - - git checkout dev - - cd .. + - cd public ; git checkout dev ; cd - + - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ artifacts: paths: