diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-22 15:29:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 15:29:12 -0500 |
| commit | a5b83123177b41a1b9cc7fabe89e408228efcd19 (patch) | |
| tree | 3e8eb2c9995e0ccd9f2904c507c70733f0848d69 /.travis.yml | |
| parent | 2e0f7baef344474b39d660db5fb0b8c9fb33dc3b (diff) | |
| parent | fe4a5706acb4a734acccc86a01416ed695ffbd06 (diff) | |
| download | rails-a5b83123177b41a1b9cc7fabe89e408228efcd19.tar.gz rails-a5b83123177b41a1b9cc7fabe89e408228efcd19.tar.bz2 rails-a5b83123177b41a1b9cc7fabe89e408228efcd19.zip | |
Merge pull request #28098 from rails/rails-ujs-intergration
Better integrate rails-ujs in our repository
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index eafa06e44f..ae4d78a31f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ cache: directories: - /tmp/cache/unicode_conformance - /tmp/beanstalkd-1.10 + - node_modules + - $HOME/.nvm services: - memcached @@ -21,6 +23,11 @@ before_install: - "gem update bundler" - "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)" - "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd" + - "[[ $GEM != 'av:ujs' ]] || nvm install node" + - "[[ $GEM != 'av:ujs' ]] || node --version" + - "[[ $GEM != 'av:ujs' ]] || (cd actionview && npm install)" + - "[[ $GEM != 'av:ujs' ]] || [[ $(phantomjs --version) > '2' ]] || npm install -g phantomjs-prebuilt" + before_script: # Set Sauce Labs username and access key. Obfuscated, purposefully not encrypted. @@ -52,6 +59,8 @@ rvm: matrix: include: + - rvm: 2.4.0 + env: "GEM=av:ujs" - rvm: 2.2.6 env: "GEM=aj:integration" services: |