Skip to content

Commit

Permalink
update softserv to notch8
Browse files Browse the repository at this point in the history
  • Loading branch information
bkiahstroud committed Jan 23, 2025
1 parent 1decc6d commit c7b1af6
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .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.14
uses: notch8/actions/.github/workflows/brakeman-audit.yaml@v0.0.14
with:
webTarget: web
tag: latest
tag: latest
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@v0.0.14
uses: notch8/actions/.github/workflows/build.yaml@v0.0.14
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:
# We are using version 14 since this project has not been knap-sackerized yet
jobs:
build:
uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.15
uses: notch8/actions/.github/workflows/build.yaml@v0.0.15
secrets: inherit
with:
platforms: "linux/amd64"
Expand All @@ -26,13 +26,13 @@ jobs:
solrTarget: hyku-solr
test:
needs: build
uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.15
uses: notch8/actions/.github/workflows/test.yaml@v0.0.15
with:
webTarget: hyku-base
workerTarget: hyku-worker
lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.15
uses: notch8/actions/.github/workflows/lint.yaml@v0.0.15
with:
webTarget: hyku-base
workerTarget: hyku-worker
4 changes: 2 additions & 2 deletions .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.14
uses: notch8/actions/.github/workflows/bundler-audit.yaml@v0.0.14
with:
webTarget: web
tag: latest
tag: latest
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ on:
# We are using version 14 since this project has not been knap-sackerized yet
jobs:
deploy:
uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.14
uses: notch8/actions/.github/workflows/deploy.yaml@v0.0.14
secrets: inherit
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ gem 'i18n', '1.11.0' # TODO: why does updating to 1.14.1 break allinson flex?
gem 'i18n-debug', require: false, group: %i[development test]
gem 'i18n-tasks', group: %i[development test]
gem 'iiif_manifest', git: 'https://github.com/samvera/iiif_manifest.git', ref: 'e5d8a2d'
gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
gem 'iiif_print', github: 'notch8/iiif_print', branch: 'main'
gem 'jbuilder', '~> 2.5'
gem 'jquery-rails' # Use jquery as the JavaScript library
# The maintainers yanked 0.3.2 version (see https://github.com/dryruby/json-canonicalization/issues/2)
Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ GIT
aws-sdk-sqs (~> 1)
rails (>= 4.2)

GIT
remote: https://github.com/notch8/iiif_print.git
revision: 5c5fa6880b3dc22beed738cfcba7af57b698ac36
ref: 5c5fa6880b3dc22beed738cfcba7af57b698ac36
specs:
iiif_print (1.0.0)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rdf-vocab (~> 3.0)

GIT
remote: https://github.com/samvera-labs/allinson_flex.git
revision: 581b58d57a90440f71d5d4ad8e1a9e4316ea92a3
Expand Down Expand Up @@ -133,18 +145,6 @@ GIT
iiif_manifest (1.3.1)
activesupport (>= 4)

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
revision: 5c5fa6880b3dc22beed738cfcba7af57b698ac36
branch: main
specs:
iiif_print (1.0.0)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rdf-vocab (~> 3.0)

GIT
remote: https://github.com/stanhu/omniauth-cas.git
revision: 4211e6d05941b4a981f9a36b49ec166cecd0e271
Expand Down Expand Up @@ -428,7 +428,7 @@ GEM
activerecord (>= 4.1.14, < 8.0.0)
deprecation (1.1.0)
activesupport
derivative-rodeo (0.5.2)
derivative-rodeo (0.5.3)
activesupport (>= 5)
aws-sdk-s3
aws-sdk-sqs
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ x-app: &app
BUILDKIT_INLINE_CACHE: 1
cache_from:
- ghcr.io/samvera/hyku/base:latest
- ghcr.io/scientist-softserv/utk-hyku:latest
image: ghcr.io/scientist-softserv/utk-hyku:${TAG:-latest}
- ghcr.io/notch8/utk-hyku:latest
image: ghcr.io/notch8/utk-hyku:${TAG:-latest}
env_file:
- .env
# NOTE: all common env variables moved to .env
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
timeout: "8s"

solr:
image: ghcr.io/scientist-softserv/utk-hyku/solr:${TAG:-latest}
image: ghcr.io/notch8/utk-hyku/solr:${TAG:-latest}
build:
context: ./solr
target: hyku-solr
Expand Down Expand Up @@ -95,7 +95,7 @@ services:
condition: service_healthy

fcrepo:
image: ghcr.io/scientist-softserv/docker-fcrepo:4.7.6-s3-streaming
image: ghcr.io/notch8/docker-fcrepo:4.7.6-s3-streaming
volumes:
- fcrepo:/data:cached
env_file:
Expand Down Expand Up @@ -177,9 +177,9 @@ services:
args:
BUILDKIT_INLINE_CACHE: 1
cache_from:
- ghcr.io/scientist-softserv/utk-hyku:${TAG:-latest}
- ghcr.io/scientist-softserv/utk-hyku/worker:${TAG:-latest}
image: ghcr.io/scientist-softserv/utk-hyku/worker:${TAG:-latest}
- ghcr.io/notch8/utk-hyku:${TAG:-latest}
- ghcr.io/notch8/utk-hyku/worker:${TAG:-latest}
image: ghcr.io/notch8/utk-hyku/worker:${TAG:-latest}
depends_on:
check_volumes:
condition: service_completed_successfully
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/hyrax/homepage_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
end
end

xcontext "without solr" do # skip until and fix with ticket #148 https://github.com/scientist-softserv/palni-palci/issues/148
xcontext "without solr" do # skip until and fix with ticket #148 https://github.com/notch8/palni-palci/issues/148
before do
allow(controller).to receive(:repository).and_return(instance_double(Blacklight::Solr::Repository))
allow(controller.repository).to receive(:search).and_raise Blacklight::Exceptions::InvalidRequest
Expand Down

0 comments on commit c7b1af6

Please sign in to comment.