Permalink
Browse files

Merge pull request #5180 from XhmikosR/patch-1

Merge pull request 5180
  • Loading branch information...
2 parents d3ae840 + 801d12b commit cb99cf603a2187b4ca76f575ec0ae5a8f412ec20 @jekyllbot jekyllbot committed on GitHub Aug 3, 2016
Showing with 20 additions and 28 deletions.
  1. +1 −1 Gemfile
  2. +19 −27 appveyor.yml
View
@@ -72,7 +72,7 @@ group :jekyll_optional_dependencies do
gem "kramdown", "~> 1.9"
gem "rdoc", "~> 4.2"
- platform :ruby, :mswin, :mingw do
+ platform :ruby, :mswin, :mingw, :x64_mingw do
gem "rdiscount", "~> 2.0"
gem "pygments.rb", "~> 0.6.0"
gem "redcarpet", "~> 3.2", ">= 3.2.3"
View
@@ -12,49 +12,41 @@ branches:
build: off
install:
- - SET PATH=C:\Ruby%ruby_folder_version%\bin;%PATH%
+ - SET PATH=C:\Ruby%RUBY_FOLDER_VER%\bin;%PATH%
- bundle install --retry 5
environment:
BUNDLE_WITHOUT: "benchmark:site:development"
matrix:
- - ruby_folder_version: "23"
- ruby_gems_folder: "2.3.0"
+ - RUBY_FOLDER_VER: "23"
+ GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "test"
- - ruby_folder_version: "23"
- ruby_gems_folder: "2.3.0"
+ - RUBY_FOLDER_VER: "23"
+ GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "cucumber"
- - ruby_folder_version: "23"
- ruby_gems_folder: "2.3.0"
+ - RUBY_FOLDER_VER: "23"
+ GEMS_FOLDER_VER: "2.3.0"
TEST_SUITE: "fmt"
- - ruby_folder_version: "23-x64"
- ruby_gems_folder: "2.3.0"
- TEST_SUITE: "cucumber"
- - ruby_folder_version: "23-x64"
- ruby_gems_folder: "2.3.0"
+ - 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_version: "22"
- ruby_gems_folder: "2.2.0"
+ - RUBY_FOLDER_VER: "22"
+ GEMS_FOLDER_VER: "2.2.0"
TEST_SUITE: "test"
- - ruby_folder_version: "22"
- ruby_gems_folder: "2.2.0"
- TEST_SUITE: "cucumber"
- - ruby_folder_version: "21"
- ruby_gems_folder: "2.1.0"
+ - RUBY_FOLDER_VER: "21"
+ GEMS_FOLDER_VER: "2.1.0"
TEST_SUITE: "test"
- - ruby_folder_version: "21"
- ruby_gems_folder: "2.1.0"
- TEST_SUITE: "cucumber"
test_script:
- ruby --version
- gem --version
- bundler --version
- bash ./script/cibuild
-matrix:
- fast_finish: true
-
cache:
- - C:\Ruby%ruby_folder_version%\bin -> Gemfile,jekyll.gemspec
- - C:\Ruby%ruby_folder_version%\lib\ruby\gems\%ruby_gems_folder% -> Gemfile,jekyll.gemspec
+ # 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

0 comments on commit cb99cf6

Please sign in to comment.