🚧 [i681] - VALKYRIZE Adventist

.github/workflows/build-test-lint.yaml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/[email protected].15
+    uses: scientist-softserv/actions/.github/workflows/[email protected].22
     secrets: inherit
     with:
       platforms: 'linux/amd64'
@@ -26,17 +26,15 @@ jobs:
 
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected].15
+    uses: scientist-softserv/actions/.github/workflows/[email protected].22
     with:
       confdir: '/app/samvera/hyrax-webapp/solr/conf'
-      webTarget: hyku-web
-      workerTarget: hyku-worker
       rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"
 
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected].15
+    uses: scientist-softserv/actions/.github/workflows/[email protected].22
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker
-      rubocop_cmd: "cd .. && bundle && bundle exec rubocop --parallel --format progress"
+      rubocop_cmd: "cd .. && bundle && bundle exec rubocop --parallel --format progress"

.gitignore

@@ -9,3 +9,4 @@ scratch.md
 .DS_Store
 
 /coverage
+file_cache/

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "hyrax-webapp"]
 	path = hyrax-webapp
-	url = https://github.com/samvera/hyku.git
-	branch = adventist_dev
+	url = https://github.com/samvera/hyku.git

.rubocop.yml

@@ -1,132 +0,0 @@
-# Turn on RSpec cops
-require: rubocop-rspec
-inherit_from: .rubocop_todo.yml
-
-# With the rubocop 0.47.0 and rubocop-rspec 1.8.0 the following stderr message was sent:
-#   An error occurred while RSpec/DescribedClass cop was inspecting path/to/file
-RSpec/DescribedClass:
-  Enabled: false
-
-AllCops:
-  DisplayCopNames: true
-  TargetRubyVersion: 2.3
-  Exclude:
-    - 'hyrax-webapp/**/*'
-    - 'bin/**/*'
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'vendor/**/*'
-    - 'lib/dog_biscuits/**/*'
-    - 'lib/dog_biscuits.rb'
-    - '.internal_test_app/**/*'
-    - 'spec/fixtures/**/*'
-    - 'spec/internal/**/*'
-    - 'spec/test_app_templates/**/*'
-    - 'Rakefile'
-    - 'lib/tasks/rubocop.rake'
-    # disabling collections controller as most of the rubocop errors are in hyrax
-    - 'app/controllers/hyrax/dashboard/collections_controller.rb'
-
-Rails:
-  Enabled: true
-
-Rails/DynamicFindBy:
-  Whitelist:
-    - find_by_user_key
-  Exclude:
-    - 'lib/importer/factory/object_factory.rb'
-
-Rails/UnknownEnv:
-  Environments:
-    - development
-    - production
-    - staging
-    - test
-
-Metrics/LineLength:
-  Max: 120
-  Exclude:
-    - 'app/controllers/catalog_controller.rb'
-    - 'spec/controllers/curation_concerns/generic_works_controller_spec.rb'
-    - 'spec/services/iiif_collection_thumbnail_path_service_spec.rb'
-    - 'spec/services/iiif_work_thumbnail_path_service_spec.rb'
-    - 'spec/routing/proprietor/accounts_routing_spec.rb'
-
-Layout/IndentationConsistency:
-  EnforcedStyle: rails
-
-Layout/DotPosition:
-  EnforcedStyle: leading
-
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/WordArray:
-  Enabled: false
-
-Metrics/ClassLength:
-  Exclude:
-    - 'app/controllers/catalog_controller.rb'
-
-Metrics/ModuleLength:
-  Max: 200
-
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/role.rb'
-
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/controllers/hyku/registrations_controller_spec.rb'
-
-RSpec/NamedSubject:
-  Enabled: false
-
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/requests/**/*'
-    - 'spec/features/**/*'
-    - 'spec/views/**/*'
-    - 'spec/routing/**/*'
-    - 'spec/tasks/**/*'
-
-Rails/FilePath:
-  Exclude:
-    - 'spec/routing/**/*'
-
-RSpec/ExpectActual:
-  Exclude:
-    - 'spec/routing/**/*'
-
-RSpec/VerifiedDoubles:
-  Enabled: false
-
-RSpec/MessageExpectation:
-  Enabled: false
-
-# By default RSpec/MessageSpies has the following:
-#   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
-RSpec/MessageSpies:
-  Enabled: true
-  EnforcedStyle: receive
-
-RSpec/ExampleLength:
-  Max: 20
-
-RSpec/NestedGroups:
-  Max: 4
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
-    - 'lib/tasks/*.rake'
-    - 'app/controllers/catalog_controller.rb'

Dockerfile

@@ -1,9 +1,14 @@
-FROM ghcr.io/samvera/hyku/base:d6ef0431 as hyku-knap-base
+FROM ghcr.io/samvera/hyku/base:20b8c56e as hyku-knap-base
+
+# Ensure the directory exists
+RUN mkdir -p /app/.bundler.d
 
 # This is specifically NOT $APP_PATH but the parent directory
 COPY --chown=1001:101 . /app/samvera
+COPY --chown=1001:101 bundler.d/ /app/.bundler.d/
 ENV BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
 ENV BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
+ENV BUNDLE_BUNDLER_INJECT__GEM_PATH=/app/samvera/bundler.d
 
 RUN bundle install --jobs "$(nproc)"