Skip to content

Commit

Permalink
softserv melted
Browse files Browse the repository at this point in the history
  • Loading branch information
orangewolf committed Jan 24, 2025
1 parent 1decc6d commit e7fd76c
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 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/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
webTarget: web
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/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
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/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
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/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
webTarget: hyku-base
workerTarget: hyku-worker
lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
webTarget: hyku-base
workerTarget: hyku-worker
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/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
webTarget: 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 @@ -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/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ GIT
activesupport (>= 4)

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
remote: https://github.com/notch8/iiif_print.git
revision: 5c5fa6880b3dc22beed738cfcba7af57b698ac36
branch: main
specs:
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 e7fd76c

Please sign in to comment.