From d49bf808b626aa71752d2cff5406e45d62c3688c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 13 Aug 2016 09:49:50 +0300 Subject: [PATCH 1/2] Update AppVeyor config. Install gems in ./vendor/bundle and cache those only. --- appveyor.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9e4ac855..2fe407f4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,3 @@ -# https://www.appveyor.com/docs/appveyor-yml - version: "{build}" clone_depth: 10 @@ -13,31 +11,24 @@ build: off install: - SET PATH=C:\Ruby%RUBY_FOLDER_VER%\bin;%PATH% - - bundle install --retry 5 + - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle environment: BUNDLE_WITHOUT: "benchmark:site:development" matrix: - RUBY_FOLDER_VER: "23" - GEMS_FOLDER_VER: "2.3.0" TEST_SUITE: "test" - RUBY_FOLDER_VER: "23" - GEMS_FOLDER_VER: "2.3.0" TEST_SUITE: "cucumber" - RUBY_FOLDER_VER: "23" - GEMS_FOLDER_VER: "2.3.0" TEST_SUITE: "fmt" - RUBY_FOLDER_VER: "23" - GEMS_FOLDER_VER: "2.3.0" TEST_SUITE: "default-site" - RUBY_FOLDER_VER: "23-x64" - GEMS_FOLDER_VER: "2.3.0" TEST_SUITE: "test" - RUBY_FOLDER_VER: "22" - GEMS_FOLDER_VER: "2.2.0" TEST_SUITE: "test" - RUBY_FOLDER_VER: "21" - GEMS_FOLDER_VER: "2.1.0" TEST_SUITE: "test" test_script: @@ -48,5 +39,4 @@ test_script: cache: # If one of the files after the right arrow changes, cache will be skipped - - C:\Ruby%RUBY_FOLDER_VER%\bin -> Gemfile,jekyll.gemspec,appveyor.yml - - C:\Ruby%RUBY_FOLDER_VER%\lib\ruby\gems\%GEMS_FOLDER_VER% -> Gemfile,jekyll.gemspec,appveyor.yml + - 'vendor\bundle -> appveyor.yml,Gemfile,jekyll.gemspec' From d0d41792f9b4fb53960bc07d00b0e8a486c270be Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 23 Aug 2016 02:01:47 +0300 Subject: [PATCH 2/2] script/default-site: add `ruby` in exec command. Windows doesn't recognize `exe/jekyll` as Ruby executable so this should work everywhere. --- script/default-site | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/default-site b/script/default-site index 006fd93b..5e96a991 100755 --- a/script/default-site +++ b/script/default-site @@ -10,7 +10,7 @@ rm -Rf ./tmp/default-site workdir=$(pwd) echo "$0: creating new default site" -bundle exec exe/jekyll new tmp/default-site +bundle exec ruby exe/jekyll new tmp/default-site pushd tmp/default-site echo "$0: respecifying the jekyll install location"