dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5240 from XhmikosR/appveyor 

Merge pull request 5240
This commit is contained in:
jekyllbot 2016-08-29 11:57:22 -07:00 committed by GitHub
parent 02602bebd7 d0d41792f9
commit bd4e7465ef
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
appveyor.yml
View File

@ -1,5 +1,3 @@
# https://www.appveyor.com/docs/appveyor-yml
version: "{build}" version: "{build}"
clone_depth: 10 clone_depth: 10
@ -13,31 +11,24 @@ build: off
install: install:
- SET PATH=C:\Ruby%RUBY_FOLDER_VER%\bin;%PATH% - 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: environment:
BUNDLE_WITHOUT: "benchmark:site:development" BUNDLE_WITHOUT: "benchmark:site:development"
matrix: matrix:
- RUBY_FOLDER_VER: "23" - RUBY_FOLDER_VER: "23"
GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "test" TEST_SUITE: "test"
- RUBY_FOLDER_VER: "23" - RUBY_FOLDER_VER: "23"
GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "cucumber" TEST_SUITE: "cucumber"
- RUBY_FOLDER_VER: "23" - RUBY_FOLDER_VER: "23"
GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "fmt" TEST_SUITE: "fmt"
- RUBY_FOLDER_VER: "23" - RUBY_FOLDER_VER: "23"
GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "default-site" TEST_SUITE: "default-site"
- RUBY_FOLDER_VER: "23-x64" - RUBY_FOLDER_VER: "23-x64"
GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "test" TEST_SUITE: "test"
- RUBY_FOLDER_VER: "22" - RUBY_FOLDER_VER: "22"
GEMS_FOLDER_VER: "2.2.0"
TEST_SUITE: "test" TEST_SUITE: "test"
- RUBY_FOLDER_VER: "21" - RUBY_FOLDER_VER: "21"
GEMS_FOLDER_VER: "2.1.0"
TEST_SUITE: "test" TEST_SUITE: "test"
test_script: test_script:
@ -48,5 +39,4 @@ test_script:
cache: cache:
# If one of the files after the right arrow changes, cache will be skipped # 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 - 'vendor\bundle -> appveyor.yml,Gemfile,jekyll.gemspec'
- C:\Ruby%RUBY_FOLDER_VER%\lib\ruby\gems\%GEMS_FOLDER_VER% -> Gemfile,jekyll.gemspec,appveyor.yml

2
script/default-site
View File

@ -10,7 +10,7 @@ rm -Rf ./tmp/default-site
workdir=$(pwd) workdir=$(pwd)
echo "$0: creating new default site" 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 pushd tmp/default-site
echo "$0: respecifying the jekyll install location" echo "$0: respecifying the jekyll install location"