Skip to content

Commit

Permalink
Merge branch 'master' into pull/ruby-2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
DirtyF authored Jul 23, 2018
2 parents 160e6a5 + 6fe4f84 commit 098f835
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ inherit_gem:
AllCops:
TargetRubyVersion: 2.3

AllCops:
TargetRubyVersion: 2.3

Metrics/LineLength:
Exclude:
- jekyll-sass-converter.gemspec
4 changes: 4 additions & 0 deletions History.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

* Target Ruby 2.3 (#70)

### Development Fixes

* Add appveyor.yml (#76)

## 1.5.2 / 2017-02-03

### Development Fixes
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Let Jekyll build your Sass and SCSS!

[![Build Status](https://travis-ci.org/jekyll/jekyll-sass-converter.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-sass-converter)
[![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll-sass-converter/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/jekyll/jekyll-sass-converter/branch/master)

## Installation

Expand Down
30 changes: 30 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
version: "{build}"

clone_depth: 10

branches:
only:
- master

build: off

install:
- SET PATH=C:\Ruby%RUBY_FOLDER_VER%\bin;%PATH%
- bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle

environment:
matrix:
- RUBY_FOLDER_VER: "25"
- RUBY_FOLDER_VER: "25-x64"
- RUBY_FOLDER_VER: "24"
- RUBY_FOLDER_VER: "23"

test_script:
- ruby --version
- gem --version
- bundler --version
- bash ./script/cibuild

cache:
# If one of the files after the right arrow changes, cache will be skipped
- 'vendor\bundle -> appveyor.yml,Gemfile,jekyll-sass-converter.gemspec'
2 changes: 1 addition & 1 deletion jekyll-sass-converter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "jekyll", "~> 3.0"
spec.add_development_dependency "rake"
spec.add_development_dependency "rspec"
spec.add_development_dependency "rubocop-jekyll", "~> 0.1"
spec.add_development_dependency "rubocop-jekyll", "~> 0.1.0"
end

0 comments on commit 098f835

Please sign in to comment.