Skip to content

Commit

Permalink
Merge pull request #1539 from notch8/fix_s3_specs
Browse files Browse the repository at this point in the history
Fix s3 specs - part 2
  • Loading branch information
cjcolvar authored Oct 3, 2018
2 parents 7526936 + ff47cc0 commit a93a8f3
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@
config.run_all_when_everything_filtered = true

# only run aws tests from CI (or w/ `--tag aws`) and only run it on the main repo, since that
# is where the valid aws keys live
config.filter_run_excluding(aws: true) unless ENV['CI'] && ENV['TRAVIS_PULL_REQUEST_SLUG'].match('samvera-labs/hyku')
# is where the valid aws keys live. TRAVIS_PULL_REQUEST_SLUG is "" when the job is a push job
unless ENV['CI'] &&
(ENV['TRAVIS_PULL_REQUEST_SLUG'].match('samvera-labs/hyku') || ENV['TRAVIS_PULL_REQUEST_SLUG'].blank?)
config.filter_run_excluding(aws: true)
end

# Allows RSpec to persist some state between runs in order to support
# the `--only-failures` and `--next-failure` CLI options. We recommend
Expand Down

0 comments on commit a93a8f3

Please sign in to comment.