From 06a8503d2edb395c80af6177257a097ea272b10c Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:47:12 +0200 Subject: [PATCH 1/8] Remove deprecated travis settings --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87bb86f..97cf261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,3 @@ rvm: install: gem install jekyll script: jekyll build - -sudo: false -exclude: [vendor] From 48c722b002ece950bca2cedc397b0baf0b2b2a73 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:48:14 +0200 Subject: [PATCH 2/8] Use Travis default rvm --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97cf261..9205aba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: ruby -rvm: -- 2.3.3 install: gem install jekyll script: jekyll build From 59e8bfdf03301243508b691f811bc5017d586793 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:53:12 +0200 Subject: [PATCH 3/8] Try using bundler directly --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9205aba..97b5514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ language: ruby - -install: gem install jekyll -script: jekyll build +install: gem install jekyll bundler +script: bundle exec jekyll build From 94c330f212ae09ef8a30ee17eaf162cfa0d32845 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:55:26 +0200 Subject: [PATCH 4/8] Cache bundler on Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 97b5514..fc19138 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: ruby install: gem install jekyll bundler script: bundle exec jekyll build +cache: bundler From 71aafdad089faea063613386a36f6b36f8413213 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:03:07 +0200 Subject: [PATCH 5/8] Try bundle install --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc19138..9c427db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: ruby install: gem install jekyll bundler -script: bundle exec jekyll build +script: + - bundle install + - bundle exec jekyll build cache: bundler From fcdb484624a6cad796f4b085a4942e7b1d37c39c Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:06:53 +0200 Subject: [PATCH 6/8] Move installation within script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c427db..6ce4b3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby -install: gem install jekyll bundler script: + - gem install jekyll bundler - bundle install - bundle exec jekyll build cache: bundler From 5b04523de359a5407ddf6a9c27618de514ca7395 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:33:26 +0200 Subject: [PATCH 7/8] Update bundler requirement --- freelancer-theme-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freelancer-theme-jekyll.gemspec b/freelancer-theme-jekyll.gemspec index a07be6c..972a44f 100644 --- a/freelancer-theme-jekyll.gemspec +++ b/freelancer-theme-jekyll.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll-data", "~> 1.0" spec.add_runtime_dependency "jemoji", "~> 0.8" - spec.add_development_dependency "bundler", "~> 1.12" + spec.add_development_dependency "bundler", "~> 2.0.2" spec.add_development_dependency "rake", "~> 10.0" end From 34eb081c97bf57dc288e6108e5ebdb14824e59c9 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:37:25 +0200 Subject: [PATCH 8/8] require any bundler newer than the original one --- freelancer-theme-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freelancer-theme-jekyll.gemspec b/freelancer-theme-jekyll.gemspec index 972a44f..daac1c8 100644 --- a/freelancer-theme-jekyll.gemspec +++ b/freelancer-theme-jekyll.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll-data", "~> 1.0" spec.add_runtime_dependency "jemoji", "~> 0.8" - spec.add_development_dependency "bundler", "~> 2.0.2" + spec.add_development_dependency "bundler", ">= 1.12" spec.add_development_dependency "rake", "~> 10.0" end