Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test with Rails 7.2 #560

Merged
merged 7 commits into from
Oct 1, 2024
Merged

Test with Rails 7.2 #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b74542
Test with Rails 7.2
cjcolvar Aug 20, 2024
90194a1
Use latest zookeeper for testing
cjcolvar Aug 21, 2024
de149f7
Drop support for EOL ruby/rails
cjcolvar Aug 21, 2024
c4c12f6
Move visibility methods into submodule and include it after define_at…
cjcolvar Aug 27, 2024
7bd83b5
Bump bundler version to workaround error and use latest ruby/rails ve…
cjcolvar Aug 27, 2024
e1761fe
Use released version of ActiveFedora
cjcolvar Sep 30, 2024
5681b46
Test with AF 15+ on Rails 7.2+
cjcolvar Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 79 additions & 120 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
default: '~> 7'
bundler_version:
type: string
default: 2.4.5
default: 2.5.18
rails_version:
type: string
solr_port:
Expand All @@ -23,12 +23,30 @@ jobs:
solr_config_path:
type: string
default: '.internal_test_app/solr/conf'
ruby_type:
type: string
default: 'ruby'
fcrepo_version:
type: string
default: "4.7.5"
solr_version:
type: string
default: "9"

docker:
- image: cimg/<< parameters.ruby_type >>:<< parameters.ruby_version >>-browsers
- image: samvera/fcrepo4:<< parameters.fcrepo_version >>
environment:
CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
- image: zookeeper:3.9
environment:
ZOO_ADMINSERVER_ENABLED: false
- image: solr:<< parameters.solr_version >>
environment:
VERBOSE: yes
SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt -p << parameters.solr_port >> -z localhost:2181"

executor:
name: 'samvera/ruby_fcrepo_solr'
ruby_version: << parameters.ruby_version >>
solr_port: << parameters.solr_port >>
solr_version: "9"
working_directory: ~/project

environment:
Expand All @@ -37,6 +55,13 @@ jobs:
SOLR_TEST_PORT: << parameters.solr_port >>
ACTIVE_FEDORA_VERSION: << parameters.active_fedora_version >>
BLACKLIGHT_VERSION: << parameters.blacklight_version >>
BUNDLE_PATH: vendor/bundle
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
RAILS_ENV: test
RACK_ENV: test
FCREPO_TEST_PORT: 8080

steps:
# Explicitly install sqlite3 since it isn't included in the cimg/ruby:2.5 image
- run: sudo apt-get update && sudo apt-get install -y sqlite3 libsqlite3-dev
Expand Down Expand Up @@ -75,79 +100,46 @@ jobs:
workflows:
ci:
jobs:
- bundle_and_test:
name: "ruby3-3_rails7.2"
ruby_version: 3.3.4
rails_version: 7.2.1
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-3_rails7.1"
ruby_version: 3.3.0
rails_version: 7.1.3
ruby_version: 3.3.4
rails_version: 7.1.4
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-2_rails7.1"
ruby_version: 3.2.3
rails_version: 7.1.3
ruby_version: 3.2.5
rails_version: 7.1.4
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-1_rails7.1"
ruby_version: 3.1.4
rails_version: 7.1.3
- bundle_and_test:
name: "ruby3-0_rails7.1"
ruby_version: 3.0.6
rails_version: 7.1.3
ruby_version: 3.1.6
rails_version: 7.1.4
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-3_rails7.0"
ruby_version: 3.3.0
rails_version: 7.0.8
ruby_version: 3.3.4
rails_version: 7.0.8.4
- bundle_and_test:
name: "ruby3-2_rails7.0"
ruby_version: 3.2.3
rails_version: 7.0.8
ruby_version: 3.2.5
rails_version: 7.0.8.4
- bundle_and_test:
name: "ruby3-1_rails7.0"
ruby_version: 3.1.4
rails_version: 7.0.8
- bundle_and_test:
name: "ruby3-0_rails7.0"
ruby_version: 3.0.6
rails_version: 7.0.8
ruby_version: 3.1.6
rails_version: 7.0.8.4
- bundle_and_test:
name: "ruby3-2_rails6.1"
ruby_version: 3.2.3
rails_version: 6.1.7.6
ruby_version: 3.2.5
rails_version: 6.1.7.8
- bundle_and_test:
name: "ruby3-1_rails6.1"
ruby_version: 3.1.4
rails_version: 6.1.7.6
- bundle_and_test:
name: "ruby3-0_rails6.1"
ruby_version: 3.0.6
rails_version: 6.1.7.6
- bundle_and_test:
name: "ruby2-7_rails6.1"
ruby_version: 2.7.8
rails_version: 6.1.7.6
- bundle_and_test:
name: "ruby3-2_rails6.0"
ruby_version: 3.2.3
rails_version: 6.0.6.1
- bundle_and_test:
name: "ruby3-1_rails6.0"
ruby_version: 3.1.4
rails_version: 6.0.6.1
- bundle_and_test:
name: "ruby3-0_rails6.0"
ruby_version: 3.0.6
rails_version: 6.1.7.1
- bundle_and_test:
name: "ruby2-7_rails6.0"
ruby_version: 2.7.8
rails_version: 6.0.6.1
- bundle_and_test:
name: "ruby2-7_rails5.2"
ruby_version: 2.7.8
rails_version: 5.2.8.1
- bundle_and_test:
name: "ruby2-7_rails5.2-bl6"
blacklight_version: 6.23.0
ruby_version: 2.7.8
rails_version: 5.2.8.1
ruby_version: 3.1.6
rails_version: 6.1.7.8

nightly:
triggers:
Expand All @@ -159,76 +151,43 @@ workflows:
- main

jobs:
- bundle_and_test:
name: "ruby3-3_rails7.2"
ruby_version: 3.3.4
rails_version: 7.2.1
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-3_rails7.1"
ruby_version: 3.3.0
rails_version: 7.1.3
ruby_version: 3.3.4
rails_version: 7.1.4
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-2_rails7.1"
ruby_version: 3.2.3
rails_version: 7.1.3
ruby_version: 3.2.5
rails_version: 7.1.4
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-1_rails7.1"
ruby_version: 3.1.4
rails_version: 7.1.3
- bundle_and_test:
name: "ruby3-0_rails7.1"
ruby_version: 3.0.6
rails_version: 7.1.3
ruby_version: 3.1.6
rails_version: 7.1.4
active_fedora_version: '>= 15.0.0'
- bundle_and_test:
name: "ruby3-3_rails7.0"
ruby_version: 3.3.0
rails_version: 7.0.8
ruby_version: 3.3.4
rails_version: 7.0.8.4
- bundle_and_test:
name: "ruby3-2_rails7.0"
ruby_version: 3.2.3
rails_version: 7.0.8
ruby_version: 3.2.5
rails_version: 7.0.8.4
- bundle_and_test:
name: "ruby3-1_rails7.0"
ruby_version: 3.1.4
rails_version: 7.0.8
- bundle_and_test:
name: "ruby3-0_rails7.0"
ruby_version: 3.0.6
rails_version: 7.0.8
ruby_version: 3.1.6
rails_version: 7.0.8.4
- bundle_and_test:
name: "ruby3-2_rails6.1"
ruby_version: 3.2.3
rails_version: 6.1.7.6
ruby_version: 3.2.5
rails_version: 6.1.7.8
- bundle_and_test:
name: "ruby3-1_rails6.1"
ruby_version: 3.1.4
rails_version: 6.1.7.6
- bundle_and_test:
name: "ruby3-0_rails6.1"
ruby_version: 3.0.6
rails_version: 6.1.7.6
- bundle_and_test:
name: "ruby2-7_rails6.1"
ruby_version: 2.7.8
rails_version: 6.1.7.6
- bundle_and_test:
name: "ruby3-2_rails6.0"
ruby_version: 3.2.3
rails_version: 6.0.6.1
- bundle_and_test:
name: "ruby3-1_rails6.0"
ruby_version: 3.1.4
rails_version: 6.0.6.1
- bundle_and_test:
name: "ruby3-0_rails6.0"
ruby_version: 3.0.6
rails_version: 6.1.7.1
- bundle_and_test:
name: "ruby2-7_rails6.0"
ruby_version: 2.7.8
rails_version: 6.0.6.1
- bundle_and_test:
name: "ruby2-7_rails5.2"
ruby_version: 2.7.8
rails_version: 5.2.8.1
- bundle_and_test:
name: "ruby2-7_rails5.2-bl6"
blacklight_version: 6.23.0
ruby_version: 2.7.8
rails_version: 5.2.8.1
ruby_version: 3.1.6
rails_version: 6.1.7.8
7 changes: 3 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,9 @@ if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5/
gem 'psych', '< 4'
end

gem 'active-fedora', git: "https://github.com/samvera/active_fedora.git", branch: "ruby_rails_bump"
#if ENV['ACTIVE_FEDORA_VERSION']
# gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
#end
if ENV['ACTIVE_FEDORA_VERSION']
gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
end

if ENV['BLACKLIGHT_VERSION']
gem 'blacklight', ENV['BLACKLIGHT_VERSION']
Expand Down
Loading