From 29546a5747c125f976cfc37ba2f6d9fe1185dc37 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Tue, 14 Jan 2025 09:58:26 +0000 Subject: [PATCH 1/3] update refs to use new actions location --- docker-compose.yml | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 046eafaf..98dfd22d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ x-app: &app args: - HYKU_BULKRAX_ENABLED=true # command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000" - image: ghcr.io/scientist-softserv/britishlibrary:${TAG:-latest} + image: ghcr.io/notch8/britishlibrary:${TAG:-latest} env_file: - .env # NOTE: all common env variables moved to .env @@ -121,7 +121,7 @@ services: # Used exclusively for building and caching the base image to reduce build times base: <<: *app - image: ghcr.io/scientist-softserv/britishlibrary/base:${TAG:-latest} + image: ghcr.io/notch8/britishlibrary/base:${TAG:-latest} build: context: . target: hyku-base @@ -196,9 +196,9 @@ services: args: - HYKU_BULKRAX_ENABLED=true cache_from: - - ghcr.io/scientist-softserv/britishlibrary:${TAG:-latest} - - ghcr.io/scientist-softserv/britishlibrary/worker:${TAG:-latest} - image: ghcr.io/scientist-softserv/britishlibrary/worker:${TAG:-latest} + - ghcr.io/notch8/britishlibrary:${TAG:-latest} + - ghcr.io/notch8/britishlibrary/worker:${TAG:-latest} + image: ghcr.io/notch8/britishlibrary/worker:${TAG:-latest} depends_on: check_volumes: condition: service_completed_successfully diff --git a/package.json b/package.json index 4bffcbcd..13933844 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "britishlibrary", "private": true, - "repository": "https://github.com/scientist-softserv/britishlibrary.git", + "repository": "https://github.com/notch8/britishlibrary.git", "dependencies": { "universalviewer": "^3.0.36" }, From 131238705e355645550dc067f572f0e7af98d4b3 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Tue, 14 Jan 2025 10:03:12 +0000 Subject: [PATCH 2/3] update refs to use new actions location (remembering the worflow files themselves this time) --- .github/workflows/base.yaml | 2 +- .github/workflows/build-lint-test-action.yaml | 6 +++--- .github/workflows/deploy.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/base.yaml b/.github/workflows/base.yaml index d9edf08c..d1dc20e3 100644 --- a/.github/workflows/base.yaml +++ b/.github/workflows/base.yaml @@ -10,7 +10,7 @@ on: jobs: build: - uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.6 + uses: notch8/actions/.github/workflows/build.yaml@v0.0.6 secrets: inherit with: platforms: "linux/amd64" diff --git a/.github/workflows/build-lint-test-action.yaml b/.github/workflows/build-lint-test-action.yaml index 97bf150c..c4cb5575 100644 --- a/.github/workflows/build-lint-test-action.yaml +++ b/.github/workflows/build-lint-test-action.yaml @@ -17,7 +17,7 @@ on: jobs: build: - uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.13 + uses: notch8/actions/.github/workflows/build.yaml@v0.0.13 secrets: inherit with: platforms: "linux/amd64" @@ -26,7 +26,7 @@ jobs: workerTarget: hyku-worker test: needs: build - uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.13 + uses: notch8/actions/.github/workflows/test.yaml@v0.0.13 lint: needs: build - uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.13 + uses: notch8/actions/.github/workflows/lint.yaml@v0.0.13 diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e3406237..e7f8b0e1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -20,7 +20,7 @@ on: jobs: call-workflow: - uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.6 + uses: notch8/actions/.github/workflows/deploy.yaml@v0.0.6 with: k8s-release-name: hyku-${{ inputs.environment }} k8s-namespace: ${{ inputs.environment }} From 526e9a88e64992d32421c3ac3dfb0c443b7a817d Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Wed, 15 Jan 2025 17:35:28 +0000 Subject: [PATCH 3/3] update Gemfile in case not refirecting from ss to n8 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c5b76580..c60ce13f 100644 --- a/Gemfile +++ b/Gemfile @@ -151,5 +151,5 @@ gem "sentry-raven" gem 'sidekiq' gem 'tether-rails' gem 'validate_url' -gem 'hyrax-v2_graph_indexer', "~> 0.5", git: 'https://github.com/scientist-softserv/hyrax-v2_graph_indexer.git', ref: '53b0a2d28868af25d306bc361634439c008892ac' -gem 'iiif_print', git: 'https://github.com/scientist-softserv/iiif_print.git' +gem 'hyrax-v2_graph_indexer', "~> 0.5", git: 'https://github.com/notch8/hyrax-v2_graph_indexer.git', ref: '53b0a2d28868af25d306bc361634439c008892ac' +gem 'iiif_print', git: 'https://github.com/notch8/iiif_print.git'