From e7fd76cbe351db0cc0879e16d17340b263ffd643 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Thu, 23 Jan 2025 17:05:24 -0800 Subject: [PATCH] softserv melted --- .github/workflows/brakeman-audit.yaml | 2 +- .github/workflows/build-solr.yaml | 2 +- .github/workflows/build-test-lint.yaml | 6 +++--- .github/workflows/bundler-audit.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- docker-compose.yml | 14 +++++++------- spec/controllers/hyrax/homepage_controller_spec.rb | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/brakeman-audit.yaml b/.github/workflows/brakeman-audit.yaml index f6011876..d173aec8 100644 --- a/.github/workflows/brakeman-audit.yaml +++ b/.github/workflows/brakeman-audit.yaml @@ -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 \ No newline at end of file diff --git a/.github/workflows/build-solr.yaml b/.github/workflows/build-solr.yaml index 3b26e046..9a39edfc 100644 --- a/.github/workflows/build-solr.yaml +++ b/.github/workflows/build-solr.yaml @@ -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" diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml index c8fa7f06..ae80f52a 100644 --- a/.github/workflows/build-test-lint.yaml +++ b/.github/workflows/build-test-lint.yaml @@ -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" @@ -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 diff --git a/.github/workflows/bundler-audit.yaml b/.github/workflows/bundler-audit.yaml index 253aebfc..a9ef603b 100644 --- a/.github/workflows/bundler-audit.yaml +++ b/.github/workflows/bundler-audit.yaml @@ -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 \ No newline at end of file diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 49f30e02..b4daf5ab 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -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 diff --git a/Gemfile b/Gemfile index 35de8217..1625000e 100644 --- a/Gemfile +++ b/Gemfile @@ -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) diff --git a/Gemfile.lock b/Gemfile.lock index f1060563..8da5af41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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: diff --git a/docker-compose.yml b/docker-compose.yml index 7a9a299c..aea3ef6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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 @@ -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: @@ -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 diff --git a/spec/controllers/hyrax/homepage_controller_spec.rb b/spec/controllers/hyrax/homepage_controller_spec.rb index 54c0bc0e..941fbdc9 100644 --- a/spec/controllers/hyrax/homepage_controller_spec.rb +++ b/spec/controllers/hyrax/homepage_controller_spec.rb @@ -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