Skip to content

Commit

Permalink
Merge pull request #216 from gwu-libraries/t214-hyrax-2.5.0
Browse files Browse the repository at this point in the history
T214 hyrax 2.5.0
  • Loading branch information
kerchner authored Apr 24, 2019
2 parents 7798e06 + 3369d05 commit a8728d5
Show file tree
Hide file tree
Showing 4 changed files with 159 additions and 137 deletions.
29 changes: 10 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,35 @@
language: ruby
sudo: false
sudo: required
dist: trusty

addons:
apt:
packages:
- chromium-chromedriver
cache:
bundler: true
directories:
- "travis_phantomjs"

before_install:
- gem update --system
- gem install bundler
- "phantomjs --version"
- "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
- "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
- "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
- "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
- "phantomjs --version"
- google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &

rvm:
- 2.4.1
- 2.5.5

env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
- ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test'
# Travis should check every minor version in a range of supported versions, because
# rails does not follow sem-ver conventions, see http://guides.rubyonrails.org/maintenance_policy.html
# It should be sufficient to test only the latest of the patch versions for a minor version, they
# should be compatible across patch versions (only bug fixes are released in patch versions).
matrix:
- "RAILS_VERSION=5.0.3"
- "RAILS_VERSION=5.1.1"
- "RAILS_VERSION=5.1.7"

services:
- redis-server
before_script:
- jdk_switcher use oraclejdk8
notifications:
email:
recipients:
- "[email protected]"
on_success: "change"
on_failure: "always"
slack: gwlai:Ll8QuTDbyV9YRIb33bg5RfSD
- ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver
21 changes: 14 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.7'
gem 'rails', '~> 5.1.7'
# Use sqlite3 as the dev/test database for Active Record
gem 'sqlite3'
gem 'sqlite3', '~> 1.3.0'
# Use pg as the production database for Active Record
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 3.0'
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -40,12 +40,15 @@ gem 'jbuilder', '~> 2.5'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'
gem 'listen', '~> 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
Expand All @@ -54,21 +57,25 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'hyrax', '2.4.1'
gem 'hyrax', '2.5.0'

gem 'hydra-role-management'

group :development, :test do
gem 'solr_wrapper', '>= 0.3'
end

gem 'rsolr', '~> 1.0'
gem 'rsolr', '>= 1.0'
gem 'bootstrap-sass', '~> 3.0'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
gem 'devise'
gem 'devise-guests', '~> 0.5'
gem 'devise-guests', '~> 0.6'
group :development, :test do
gem 'fcrepo_wrapper'
gem 'rspec-rails'
end

gem 'riiif', '~> 2.0'

# See https://github.com/viseztrance/rails-sitemap
gem 'sitemap'
Loading

0 comments on commit a8728d5

Please sign in to comment.