Merge pull request #872 from progrium/832-mh-enable-multi-test

fix/enable multi buildpack test
This commit is contained in:
Jose Diaz-Gonzalez
2015-01-06 14:52:07 -05:00
3 changed files with 22 additions and 13 deletions

View File

@@ -109,10 +109,7 @@ deploy-tests:
@$(QUIET) $(MAKE) deploy-test-gitsubmodules
@$(QUIET) $(MAKE) deploy-test-go
@$(QUIET) $(MAKE) deploy-test-java
# broken with new buildstep.
# ref: https://github.com/progrium/dokku/issues/832
# ref: https://github.com/heroku/heroku-buildpack-ruby/pull/319
# @$(QUIET) $(MAKE) deploy-test-multi
@$(QUIET) $(MAKE) deploy-test-multi
@$(QUIET) $(MAKE) deploy-test-nodejs-express
@$(QUIET) $(MAKE) deploy-test-php
@$(QUIET) $(MAKE) deploy-test-python-flask

View File

@@ -2,5 +2,5 @@ source "https://rubygems.org"
ruby '1.9.3'
gem 'compass'
gem 'compass', ">= 1.0.1"
gem 'sass-globbing'

View File

@@ -1,19 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
chunky_png (1.3.0)
compass (0.12.3)
chunky_png (1.3.3)
compass (1.0.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (= 3.2.14)
fssm (0.2.10)
sass (3.2.14)
sass-globbing (1.1.0)
compass-core (~> 1.0.1)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.1)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
ffi (1.9.6)
multi_json (1.10.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.4.9)
sass-globbing (1.1.1)
sass (>= 3.1)
PLATFORMS
ruby
DEPENDENCIES
compass
compass (>= 1.0.1)
sass-globbing