Skip to content

Commit

Permalink
Test pull request Update 3 gemspec files to support sass 3.5. Compass…
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Lee (李健秋) committed Dec 6, 2018
1 parent 4de0147 commit 3a79617
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 111 deletions.
112 changes: 5 additions & 107 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
language: ruby

rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- jruby-18mode
- jruby-19mode
- rbx
- ree
- 2.0.0
- 2.1.0
- 2.2.0
- 2.5.1

sudo: false

Expand All @@ -20,7 +11,7 @@ env:

gemfile:
- core/Gemfile
- cli/gemfiles/sass_3_3.gemfile
- cli/gemfiles/sass_3_5.gemfile
- cli/gemfiles/listen_2.gemfile

script: cd $CI_TEST && bundle exec rake
Expand All @@ -29,103 +20,10 @@ matrix:
exclude:
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: 1.8.7
rvm: 2.5.1
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: 1.8.7
rvm: 2.5.1
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: 1.8.7
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: 1.9.2
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: 1.9.2
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: 1.9.2
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: 1.9.3
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: 1.9.3
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: 1.9.3
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: jruby-18mode
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: jruby-18mode
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: jruby-18mode
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: jruby-19mode
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: jruby-19mode
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: jruby-19mode
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: rbx
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: rbx
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: rbx
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: ree
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: ree
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: ree
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: 2.0.0
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: 2.0.0
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: 2.0.0
- gemfile: cli/gemfiles/sass_3_3.gemfile
env: CI_TEST=core
rvm: 2.1.0
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=core
rvm: 2.1.0
- gemfile: core/Gemfile
env: CI_TEST=cli
rvm: 2.1.0
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=cli
rvm: 1.8.7
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=cli
rvm: 1.9.2
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=cli
rvm: jruby-18mode
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=cli
rvm: jruby-19mode
- gemfile: cli/gemfiles/listen_2.gemfile
env: CI_TEST=cli
rvm: ree

notifications:
irc: {channels: "irc.freenode.org#compass"}
campfire:
rooms:
secure: GXnvuoZ8BVMv+JwJIBb0Ey1ARbfeypmCvpmynykD5taooedTqwyTeT32jw1YTQAOuBewgeWW1H4bF10ySz0GWmu6X2sNx9CVYT1dFudoMvLtnvEmAe0JyyRuSCBFj45jP21eRUAACltxzyX4q/gh+zRIlaRin9YBo/Xv84gDzLw=
rvm: 2.5.1
2 changes: 1 addition & 1 deletion cli/compass.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |gemspec|
gemspec.rubygems_version = "1.3.5"
gemspec.summary = %q{A Real Stylesheet Framework}

gemspec.add_dependency 'sass', '>= 3.3.13', '< 3.5'
gemspec.add_dependency 'sass', '>= 3.3.13', '< 3.6'
gemspec.add_dependency 'compass-core', "~> #{File.read(File.join(File.dirname(__FILE__),"..","core","VERSION")).strip}"
gemspec.add_dependency 'compass-import-once', "~> #{File.read(File.join(File.dirname(__FILE__),"..","import-once","VERSION")).strip}"
gemspec.add_dependency 'chunky_png', '~> 1.2'
Expand Down
2 changes: 1 addition & 1 deletion cli/gemfiles/listen_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CI=true
main_gemfile = File.expand_path(File.join(File.dirname(__FILE__), "..", "Gemfile"))
eval File.read(main_gemfile), nil, main_gemfile

gem 'sass', '~> 3.3.12'
gem 'sass', '~> 3.5.3'
gem 'compass', :path => "../"
gem 'compass-core', :path => "../../core"
gem 'compass-import-once', :path => "../../import-once"
Expand Down
10 changes: 10 additions & 0 deletions cli/gemfiles/sass_3_5.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CI=true
main_gemfile = File.expand_path(File.join(File.dirname(__FILE__), "..", "Gemfile"))
eval File.read(main_gemfile), nil, main_gemfile

gem 'sass', "~> 3.5.3"
gem 'compass', :path => "../"
gem 'compass-core', :path => "../../core"
gem 'compass-import-once', :path => "../../import-once"

gemspec :path=>"../"
2 changes: 1 addition & 1 deletion core/compass-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "sass", ">= 3.3.0", "< 3.5"
spec.add_dependency "sass", ">= 3.3.0", "< 3.6"
spec.add_dependency 'multi_json', '~> 1.0'
spec.add_development_dependency "bundler"
spec.add_development_dependency "rake"
Expand Down
2 changes: 1 addition & 1 deletion import-once/compass-import-once.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_dependency "sass", ">= 3.2", "< 3.5"
spec.add_dependency "sass", ">= 3.2", "< 3.6"
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "diff-lcs"
spec.add_development_dependency "rake"
Expand Down

0 comments on commit 3a79617

Please sign in to comment.