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

Support Fedora 6 #12

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Support Fedora 6 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef6a699
Test with ActiveFedora fedora6 branch
cjcolvar Nov 8, 2021
3fe267a
Pin rdf-rdfa due to issue with 3.2.1 involving haml
cjcolvar Apr 4, 2023
3e1b54f
Test with fedora 6.4.0 image
cjcolvar Apr 4, 2023
09c6dcf
Test with latest fcrepo, ruby, and rails
cjcolvar Oct 22, 2024
7c62177
Require ActiveFedora 15+
cjcolvar Oct 22, 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
83 changes: 56 additions & 27 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ orbs:
jobs:
bundle_lint_test:
parameters:
ruby_type:
type: string
default: 'ruby'
ruby_version:
type: string
bundler_version:
Expand All @@ -13,14 +16,27 @@ jobs:
type: string
solr_port:
type: string
default: '8985'
executor:
name: 'samvera/ruby_fcrepo_solr'
ruby_version: << parameters.ruby_version >>
solr_version: 7-slim
environment:
RAILS_VERSION: << parameters.rails_version >>
SOLR_TEST_PORT: << parameters.solr_port >>
default: '8983'
docker:
- image: cimg/<< parameters.ruby_type >>:<< parameters.ruby_version >>-browsers
environment:
BUNDLE_PATH: vendor/bundle
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
RAILS_ENV: test
RACK_ENV: test
SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
RAILS_VERSION: << parameters.rails_version >>
FCREPO_PORT: 8080
FCREPO_REST_PATH: fcrepo/rest
SOLR_TEST_PORT: << parameters.solr_port >>
- image: fcrepo/fcrepo:6.5-tomcat9
environment:
JAVA_OPTS: -Dfcrepo.autoversioning.enabled=false -Dfcrepo.external.content.allowed=/fcrepo_allow.txt
command: |
/bin/bash -c "echo 'http://fedoraAdmin:fedoraAdmin@localhost:8080/' > /fcrepo_allow.txt && catalina.sh run"
- image: solr:7.7-alpine
command: bin/solr -cloud -noprompt -f -p <<parameters.solr_port>>
steps:
- samvera/cached_checkout
- checkout
Expand All @@ -38,7 +54,8 @@ jobs:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>

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

# Skip rubocop for now
#- samvera/rubocop
Expand All @@ -49,26 +66,38 @@ workflows:
ci:
jobs:
- bundle_lint_test:
name: ruby3-2_rails7-0
ruby_version: 3.2.0
rails_version: 7.0.4.2
name: ruby3-3_rails7-2
ruby_version: 3.3.5
rails_version: 7.2.1.1
- bundle_lint_test:
name: ruby3-3_rails7-1
ruby_version: 3.3.5
rails_version: 7.1.4.1
- bundle_lint_test:
name: ruby3-2_rails6-1
ruby_version: 3.2.0
rails_version: 6.1.7.2
name: ruby3-3_rails7-0
ruby_version: 3.3.5
rails_version: 7.0.8.5
- bundle_lint_test:
name: ruby3-1_rails6-0
ruby_version: 3.1.3
rails_version: 6.0.6.1
name: ruby3-2_rails7-2
ruby_version: 3.2.5
rails_version: 7.2.1.1
- bundle_lint_test:
name: ruby3-2_rails7-1
ruby_version: 3.2.5
rails_version: 7.1.4.1
- bundle_lint_test:
name: ruby3-2_rails7-0
ruby_version: 3.2.5
rails_version: 7.0.8.5
- bundle_lint_test:
name: ruby3-0_rails6-0
ruby_version: 3.0.5
rails_version: 6.0.6.1
name: ruby3-1_rails7-2
ruby_version: 3.1.6
rails_version: 7.2.1.1
- bundle_lint_test:
name: ruby2-7_rails6-0
ruby_version: 2.7.7
rails_version: 6.0.6.1
name: ruby3-1_rails7-1
ruby_version: 3.1.6
rails_version: 7.1.4.1
- bundle_lint_test:
name: ruby2-7_rails5-2
ruby_version: 2.7.7
rails_version: 5.2.8.1
name: ruby3-1_rails7-0
ruby_version: 3.1.6
rails_version: 7.0.8.5
2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ source 'https://rubygems.org'
gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
gem 'om', git: 'https://github.com/avalonmediasystem/om.git', branch: 'ruby3'

gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'fedora6_rebase'

# Specify your gem's dependencies in active_fedora-datastreams.gemspec
gemspec
5 changes: 3 additions & 2 deletions active_fedora-datastreams.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "active-fedora", ">= 11.0.0.pre"
spec.add_dependency "activemodel", ">= 5.2"
spec.add_dependency "active-fedora", ">= 15"
spec.add_dependency "activemodel", ">= 6.1"
spec.add_dependency "om", "~> 3.1"
spec.add_dependency "nom-xml", ">= 0.5.1"
spec.add_dependency "rdf-rdfxml", '~> 3.2'
spec.add_dependency "rdf-rdfa", '= 3.2.0'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not seeing this as needed anymore in Avalon.

spec.add_dependency "rdf", "~> 3.2"
spec.add_development_dependency "bixby"
spec.add_development_dependency "byebug"
Expand Down