Skip to content

Commit

Permalink
update to notch8 repo name
Browse files Browse the repository at this point in the history
  • Loading branch information
orangewolf committed Jan 14, 2025
1 parent 5bbc680 commit 16874a4
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/brakeman-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
brakeman-audit:
uses: scientist-softserv/actions/.github/workflows/brakeman-audit.yaml@v0.0.15
uses: notch8/actions/.github/workflows/brakeman-audit.yaml@v0.0.15
with:
webTarget: hyku-web
tag: latest
2 changes: 1 addition & 1 deletion .github/workflows/build-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/build.yaml@upgrade-node20-actions
uses: notch8/actions/.github/workflows/build.yaml@upgrade-node20-actions
secrets: inherit
with:
platforms: "linux/amd64"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-solr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/build.yaml@upgrade-node20-actions
uses: notch8/actions/.github/workflows/build.yaml@upgrade-node20-actions
secrets: inherit
with:
platforms: "linux/amd64"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/build.yaml@upgrade-node20-actions
uses: notch8/actions/.github/workflows/build.yaml@upgrade-node20-actions
secrets: inherit
with:
platforms: "linux/amd64"
Expand All @@ -26,10 +26,10 @@ jobs:

test:
needs: build
uses: scientist-softserv/actions/.github/workflows/test.yaml@upgrade-node20-actions
uses: notch8/actions/.github/workflows/test.yaml@upgrade-node20-actions
with:
confdir: '/app/samvera/hyrax-webapp/solr/conf'

lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/lint.yaml@upgrade-node20-actions
uses: notch8/actions/.github/workflows/lint.yaml@upgrade-node20-actions
2 changes: 1 addition & 1 deletion .github/workflows/bundler-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
bundler-audit:
uses: scientist-softserv/actions/.github/workflows/bundler-audit.yaml@v0.0.15
uses: notch8/actions/.github/workflows/bundler-audit.yaml@v0.0.15
with:
webTarget: hyku-web
tag: latest
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
steps:
- id: setup
name: Setup
uses: scientist-softserv/actions/setup-env@upgrade-node20-actions
uses: notch8/actions/setup-env@upgrade-node20-actions
with:
tag: ${{ inputs.tag }}
image_name: ${{ inputs.image_name }}
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ gem 'hyrax', '~> 3.5.0'
gem 'bolognese', '>= 1.9.10'
gem 'hyrax-doi', git: 'https://github.com/samvera-labs/hyrax-doi.git', branch: 'hyrax_upgrade'
gem 'hyrax-iiif_av', git: 'https://github.com/samvera-labs/hyrax-iiif_av.git', branch: 'main'
gem 'iiif_print', git: 'https://github.com/scientist-softserv/iiif_print.git', branch: 'main'
gem 'iiif_print', git: 'https://github.com/notch8/iiif_print.git', branch: 'main'
gem 'postrank-uri', '>= 1.0.24'
gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
gem 'rsolr', '~> 2.0'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GIT
rails (~> 5.1)

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
remote: https://github.com/notch8/iiif_print.git
revision: 50b2659f4584ac85f468c7fcec56398f6221a412
branch: main
specs:
Expand Down
16 changes: 8 additions & 8 deletions app/services/iiif_print/tenant_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ module IiifPrint
# it is hopefully easier to understand the configuration requirements and scope to this
# change. At some point, this might make sense to bring into IIIF Print directly.
#
# @see https://github.com/scientist-softserv/palni-palci/issues/656 palni-palci#656
# @see https://github.com/scientist-softserv/palni-palci/issues/657 palni-palci#657
# @see https://github.com/scientist-softserv/palni-palci/issues/658 palni-palci#658
# @see https://github.com/scientist-softserv/palni-palci/issues/659 palni-palci#659
# @see https://github.com/notch8/palni-palci/issues/656 palni-palci#656
# @see https://github.com/notch8/palni-palci/issues/657 palni-palci#657
# @see https://github.com/notch8/palni-palci/issues/658 palni-palci#658
# @see https://github.com/notch8/palni-palci/issues/659 palni-palci#659
module TenantConfig
##
# When we were not planning on calling the underlying IiifPrint service but did due to some kind
Expand Down Expand Up @@ -94,8 +94,8 @@ def iiif_print_service_instance
# derivative_service_plugins: [ IiifPrint::TextExtractionDerivativeService ])
# end
#
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
# @see https://github.com/scientist-softserv/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
# @see https://github.com/notch8/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
module PdfSplitter
mattr_accessor :iiif_print_splitter
self.iiif_print_splitter = ::IiifPrint::SplitPdfs::PagesToJpgsSplitter
Expand All @@ -110,7 +110,7 @@ def self.call(*args)
end

##
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
module SkipSplittingPdfService
##
# @return [Symbol] Always :tenant_does_not_split_pdfs
Expand All @@ -129,7 +129,7 @@ def self.conditionally_enqueue(*_args)
# a relatively singular place for all of the configurations.
module FileSetActorDecorator
##
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
def service
return TenantConfig::SkipSplittingPdfService unless TenantConfig.use_iiif_print?

Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Application < Rails::Application
##
# This needs to be in the after initialize so that the IiifPrint gem can do it's decoration.
#
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override.
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override.
Hyrax::Actors::FileSetActor.prepend(IiifPrint::TenantConfig::FileSetActorDecorator)
Hyrax::WorkShowPresenter.prepend(IiifPrint::TenantConfig::WorkShowPresenterDecorator)
end
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ x-app: &app
context: .
target: hyku-web
cache_from:
- ghcr.io/scientist-softserv/atla-hyku/base:${TAG:-latest}
- ghcr.io/scientist-softserv/atla-hyku:${TAG:-latest}
image: ghcr.io/scientist-softserv/atla-hyku:${TAG:-latest}
- ghcr.io/notch8/atla-hyku/base:${TAG:-latest}
- ghcr.io/notch8/atla-hyku:${TAG:-latest}
image: ghcr.io/notch8/atla-hyku:${TAG:-latest}
env_file:
- .env
# NOTE: all common env variables moved to .env
Expand Down Expand Up @@ -60,8 +60,8 @@ services:
context: ./solr
target: hyku-solr
cache_from:
- ghcr.io/scientist-softserv/atla-hyku/solr:${TAG:-latest}
image: ghcr.io/scientist-softserv/atla-hyku/solr:${TAG:-latest}
- ghcr.io/notch8/atla-hyku/solr:${TAG:-latest}
image: ghcr.io/notch8/atla-hyku/solr:${TAG:-latest}
environment:
- OOM=script
- SOLR_ADMIN_USER=solr
Expand Down Expand Up @@ -127,7 +127,7 @@ services:
# Used exclusively for building and caching the base image to reduce build times
base:
<<: *app
image: ghcr.io/scientist-softserv/atla-hyku/base:${TAG:-latest}
image: ghcr.io/notch8/atla-hyku/base:${TAG:-latest}
build:
context: .
target: hyku-base
Expand Down Expand Up @@ -164,13 +164,13 @@ services:

worker:
<<: *app
image: ghcr.io/scientist-softserv/atla-hyku/worker:${TAG:-latest}
image: ghcr.io/notch8/atla-hyku/worker:${TAG:-latest}
build:
context: .
target: hyku-worker
cache_from:
- ghcr.io/scientist-softserv/atla-hyku:${TAG:-latest}
- ghcr.io/scientist-softserv/atla-hyku/worker:${TAG:-latest}
- ghcr.io/notch8/atla-hyku:${TAG:-latest}
- ghcr.io/notch8/atla-hyku/worker:${TAG:-latest}
command: bundle exec sidekiq
depends_on:
check_volumes:
Expand Down

0 comments on commit 16874a4

Please sign in to comment.