Skip to content

Commit

Permalink
bump browser tools so that chrome downloads for CI (#1974)
Browse files Browse the repository at this point in the history
* bump browser tools so that chrome downloads

* elastic-job moved
  • Loading branch information
orangewolf authored Jul 25, 2023
1 parent 911caa9 commit 9c45448
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 26 deletions.
27 changes: 18 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
version: 2.1
orbs:
samvera: samvera/circleci-orb@0
browser-tools: circleci/[email protected]
samvera: samvera/circleci-orb@1
browser-tools: circleci/[email protected]
ruby: circleci/ruby@2
node: circleci/node@5

jobs:
bundle_lint_test:
bundle:
parameters:
ruby_version:
type: string
default: 2.7.6
default: 2.7.8
bundler_version:
type: string
default: '2.0.1'
default: 2.4.8
rails_version:
type: string
default: '5.1.6'
Expand Down Expand Up @@ -76,7 +79,13 @@ jobs:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>
- samvera/rubocop
- browser-tools/install-browser-tools
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- run:
name: Check Chrome install
command: |
google-chrome --version
chromedriver --version
- run: bundle exec rake db:create db:schema:load
- run: bin/solrcloud-upload-configset.sh solr/conf
- samvera/parallel_rspec
Expand All @@ -85,7 +94,7 @@ jobs:
workflows:
ci:
jobs:
- bundle_lint_test:
ruby_version: "2.7.6"
name: "ruby2-7-6"
- bundle:
ruby_version: "2.7.8"
name: "ruby2-7-8"
solr_config_path: 'solr/conf'
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ group :test do
gem 'rspec-its'
gem 'rspec-retry'
gem 'rspec_junit_formatter'
gem 'selenium-webdriver'
gem 'selenium-webdriver', '4.8.1'
gem 'shoulda-matchers', '~> 4.0'
gem 'webdrivers', '~> 4.0'
gem 'webdrivers', '~> 4.7.0'
gem 'webmock'
end

Expand Down Expand Up @@ -119,8 +119,8 @@ group :aws, :test do
end

group :aws do
gem 'active_elastic_job', git: 'https://github.com/tawan/active-elastic-job.git',
branch: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979'
gem 'active_elastic_job', git: 'https://github.com/active-elastic-job/active-elastic-job.git',
ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979'
gem 'aws-sdk-sqs'
end

Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
GIT
remote: https://github.com/active-elastic-job/active-elastic-job.git
revision: ec51c5d9dedc4a1b47f2db41f26d5fceb251e979
ref: ec51c5d9dedc4a1b47f2db41f26d5fceb251e979
specs:
active_elastic_job (2.0.1)
aws-sdk-sqs (~> 1)
rails (>= 4.2)

GIT
remote: https://github.com/samvera-labs/hyrax-doi.git
revision: d494a50ef8ce3eae594c7ed7148c33b3c977d4a7
Expand Down Expand Up @@ -33,15 +42,6 @@ GIT
rails (~> 5.0)
rdf-vocab (~> 3.0)

GIT
remote: https://github.com/tawan/active-elastic-job.git
revision: ec51c5d9dedc4a1b47f2db41f26d5fceb251e979
branch: ec51c5d9dedc4a1b47f2db41f26d5fceb251e979
specs:
active_elastic_job (2.0.1)
aws-sdk-sqs (~> 1)
rails (>= 4.2)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -746,7 +746,7 @@ GEM
mime-types-data (3.2023.0218.1)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
mini_portile2 (2.8.4)
minitest (5.18.1)
mods (2.4.1)
edtf
Expand Down Expand Up @@ -1048,7 +1048,7 @@ GEM
sass (~> 3.5, >= 3.5.5)
secure_headers (6.5.0)
select2-rails (3.5.11)
selenium-webdriver (4.9.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -1268,7 +1268,7 @@ DEPENDENCIES
sass-rails (~> 5.0)
scss_lint
secure_headers
selenium-webdriver
selenium-webdriver (= 4.8.1)
shoulda-matchers (~> 4.0)
sidekiq (< 7.0)
simplecov
Expand All @@ -1279,7 +1279,7 @@ DEPENDENCIES
tether-rails
turbolinks (~> 5)
web-console (>= 3.3.0)
webdrivers (~> 4.0)
webdrivers (~> 4.7.0)
webmock

BUNDLED WITH
Expand Down

0 comments on commit 9c45448

Please sign in to comment.