Merge pull request #15 from scientist-softserv/knapsack-pals

Knapsack pals

.github/workflows/build-solr.yaml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.22
     secrets: inherit
     with:
       platforms: "linux/amd64"

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

@@ -17,7 +17,7 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.22
     secrets: inherit
     with:
       platforms: 'linux/amd64'
@@ -26,16 +26,14 @@ jobs:
 
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.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/lint.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.22
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker

.github/workflows/deploy.yaml

@@ -19,5 +19,5 @@ on:
 
 jobs:
   deploy:
-    uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.22
     secrets: inherit

.gitignore

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

.gitmodules

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

.rspec

@@ -0,0 +1 @@
+--require rails_helper

.rubocop.yml

@@ -0,0 +1,78 @@
+inherit_gem:
+  bixby: bixby_default.yml
+
+AllCops:
+  NewCops: disable
+  TargetRubyVersion: 3.2.2
+  DisplayCopNames: true
+  Exclude:
+  # NOTE: When we run knapsack's rubocop, we don't want to check the submodule
+  #       for Hyku.  We'll assume it's okay and has it's own policing policies.
+  - "hyrax-webapp/**/*"
+
+Metrics/BlockLength:
+  IgnoredMethods: ['included', 'describe', 'it', 'context']
+  Exclude:
+  - "spec/**/*.rb"
+
+Style/AsciiComments:
+  Enabled: false
+
+# rubocop suggests !thing.nil? instead, but that is NOT equivalent
+Style/DoubleNegation:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Rails/ApplicationJob:
+  Enabled: false
+
+Rails/ApplicationMailer:
+  Enabled: false
+
+Rails/ApplicationRecord:
+  Enabled: false
+
+Rails/RakeEnvironment:
+  Enabled: false
+
+# We define custom methods like `find_by_user_key`,
+# `find_by_created_date`, etc
+Rails/DynamicFindBy:
+  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.
+# # The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/ExpectActual:
+  Enabled: false
+
+RSpec/LetSetup:
+  Enabled: false
+
+RSpec/MessageExpectation:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Enabled: false
+
+RSpec/LeadingSubject:
+  Enabled: false

Dockerfile

@@ -2,8 +2,14 @@ FROM ghcr.io/samvera/hyku/base:latest as hyku-knap-base
 
 # 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)"
+
+RUN bundle install --jobs "$(nproc)"
 
 # Ensure root permissions for installing Tesseract data
 USER root
@@ -21,4 +27,4 @@ RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_
 CMD ./bin/web
 
 FROM hyku-web as hyku-worker
-CMD ./bin/worker
+CMD ./bin/worker