Skip to content

Commit

Permalink
Merge pull request #1379 from samvera/circleci_orbs
Browse files Browse the repository at this point in the history
Use samvera orb
  • Loading branch information
cjcolvar authored Mar 22, 2019
2 parents 76e18a1 + da14227 commit eed848c
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 24 deletions.
69 changes: 69 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
version: 2.1
orbs:
samvera: samvera/circleci-orb@0
jobs:
bundle_lint_test:
parameters:
ruby_version:
type: string
default: 2.5.5
bundler_version:
type: string
default: '2.0.1'
rails_version:
type: string
default: '5.1.6.2'
solr_config_path:
type: string
executor:
name: 'samvera/ruby_fcrepo_solr'
ruby_version: << parameters.ruby_version >>
environment:
RAILS_VERSION: << parameters.rails_version >>
steps:
- samvera/cached_checkout

- samvera/bundle_for_gem:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>
project: 'active-fedora'

- samvera/install_solr_core:
solr_config_path: << parameters.solr_config_path >>

- samvera/rubocop

- samvera/parallel_rspec

workflows:
ci:
jobs:
- bundle_lint_test:
ruby_version: "2.3.8"
name: "ruby2-3-8"
bundler_version: '1.17.3'
rails_version: '4.2.11.1'
solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
- bundle_lint_test:
ruby_version: "2.5.5"
name: "ruby2-5-5"
solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
- bundle_lint_test:
ruby_version: "2.6.2"
name: "ruby2-6-2"
solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
- bundle_lint_test:
ruby_version: "2.4.5"
name: "ruby2-4-5_rails5.0"
rails_version: '5.0.7.2'
solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
- bundle_lint_test:
ruby_version: "2.4.5"
name: "ruby2-4-5_rails5.1"
rails_version: '5.1.6.2'
solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
- bundle_lint_test:
ruby_version: "2.4.5"
name: "ruby2-4-5_rails5.2"
rails_version: '5.2.2.1'
solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
group :test do
gem 'simplecov', require: false
gem 'coveralls', require: false
gem 'rspec_junit_formatter'
end

gem 'jruby-openssl', platform: :jruby
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ActiveFedora

Code: [![Version](https://badge.fury.io/rb/active-fedora.png)](http://badge.fury.io/rb/active-fedora)
[![Build Status](https://travis-ci.org/samvera/active_fedora.png?branch=master)](https://travis-ci.org/samvera/active_fedora)
[![Build Status](https://circleci.com/gh/samvera/active_fedora.svg?style=svg)](https://circleci.com/gh/samvera/active_fedora)
[![Coverage Status](https://coveralls.io/repos/github/samvera/active_fedora/badge.svg?branch=master)](https://coveralls.io/github/samvera/active_fedora?branch=master)

Docs: [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
Expand Down Expand Up @@ -106,4 +106,4 @@ rake spec
This software has been developed by and is brought to you by the Samvera community. Learn more at the
[Samvera website](http://samvera.org/).

![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
require 'rspec/its'
require 'equivalent-xml/rspec_matchers'
require 'logger'
require 'pry' unless ENV['TRAVIS']
require 'pry' unless ENV['CI']

ActiveFedora::Base.logger = Logger.new(STDERR)
ActiveFedora::Base.logger.level = Logger::WARN
Expand Down

0 comments on commit eed848c

Please sign in to comment.