mirror of
https://github.com/codeninjasllc/discourse.git
synced 2025-02-17 04:01:29 -05:00
Add RAILS_MASTER to the travis build matrix
This commit is contained in:
parent
b4679075de
commit
5cc9f5bff5
2 changed files with 17 additions and 6 deletions
21
.travis.yml
21
.travis.yml
|
@ -1,5 +1,21 @@
|
||||||
language: ruby
|
language: ruby
|
||||||
|
|
||||||
|
env:
|
||||||
|
global:
|
||||||
|
- DISCOURSE_HOSTNAME=www.example.com
|
||||||
|
- RUBY_GC_MALLOC_LIMIT=50000000
|
||||||
|
matrix:
|
||||||
|
- "RAILS_MASTER=1"
|
||||||
|
- "RAILS_MASTER=0"
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
allow_failures:
|
||||||
|
- rvm: 2.0.0
|
||||||
|
env: "RAILS_MASTER=1"
|
||||||
|
- rvm: 2.1
|
||||||
|
env: "RAILS_MASTER=1"
|
||||||
|
fast_finish: true
|
||||||
|
|
||||||
rvm:
|
rvm:
|
||||||
- 2.0.0
|
- 2.0.0
|
||||||
- 2.1
|
- 2.1
|
||||||
|
@ -11,11 +27,6 @@ sudo: false
|
||||||
|
|
||||||
cache: bundler
|
cache: bundler
|
||||||
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
- DISCOURSE_HOSTNAME=www.example.com
|
|
||||||
- RUBY_GC_MALLOC_LIMIT=50000000
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- npm i -g jshint
|
- npm i -g jshint
|
||||||
- jshint .
|
- jshint .
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -4,7 +4,7 @@ source 'https://rubygems.org'
|
||||||
|
|
||||||
module ::Kernel
|
module ::Kernel
|
||||||
def rails_master?
|
def rails_master?
|
||||||
ENV["RAILS_MASTER"]
|
ENV["RAILS_MASTER"] == '1'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue