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

⚙️ Utilize Hyrax's schema search paths config #368

Merged
merged 2 commits into from
Sep 5, 2024
Merged

⚙️ Utilize Hyrax's schema search paths config #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
837955a
⚙️ Utilize Hyrax's schema search paths config
kirkkwang Aug 12, 2024
933a75b
🤖 Fix CI
kirkkwang Aug 12, 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
9 changes: 4 additions & 5 deletions .github/workflows/build-lint-test-action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,16 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/[email protected].13
uses: scientist-softserv/actions/.github/workflows/[email protected].15
secrets: inherit
with:
platforms: "linux/amd64"
target: hyku-base
worker: false
webTarget: hyku-base
test:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected].13
uses: scientist-softserv/actions/.github/workflows/[email protected].15
with:
setup_db_cmd: bundle exec rake prepare_and_run_tests
lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected].13
uses: scientist-softserv/actions/.github/workflows/[email protected].15
2 changes: 1 addition & 1 deletion app/services/iiif_print/simple_schema_loader_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ def config_search_paths
end
end
end
Hyrax::SimpleSchemaLoader.prepend(IiifPrint::SimpleSchemaLoaderDecorator)
Hyrax::SimpleSchemaLoader.prepend(IiifPrint::SimpleSchemaLoaderDecorator) unless Hyrax.config.respond_to?(:simple_schema_loader_config_search_paths)
2 changes: 2 additions & 0 deletions lib/iiif_print/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ class Engine < ::Rails::Engine
config.callback.set(:after_create_fileset) do |file_set, user|
IiifPrint.config.handle_after_create_fileset(file_set, user)
end

config.simple_schema_loader_config_search_paths += [IiifPrint::Engine.root] if config.respond_to?(:simple_schema_loader_config_search_paths)
end
end
# rubocop:enable Metrics/BlockLength
Expand Down
Loading