Reshare feature branch

.circleci/config.yml

@@ -62,11 +62,10 @@ jobs:
       SOLR_ADMIN_USER: admin
       SOLR_ADMIN_PASSWORD: admin
       SOLR_COLLECTION_NAME: hydra-test
-      SOLR_CONFIGSET_NAME: hyku-1
+      SOLR_CONFIGSET_NAME: hyku
       SOLR_HOST: localhost
       SOLR_PORT: 8985
       SOLR_URL: http://admin:admin@localhost:8985/solr/
-      SETTINGS__SOLR__URL: http://admin:admin@localhost:8985/solr/
       RAILS_ENV: test
       RACK_ENV: test
       FCREPO_TEST_PORT: 8080/fcrepo

.github/CONTRIBUTING.md

@@ -151,6 +151,7 @@ Common checks that may occur in our repositories:
 
 1. Travis CI - where our automated tests are running
 2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+3. Required Labels - an appropriate [semver](https://semver.org/) label (see [release.yml](https://github.com/samvera/hyku/blob/main/.github/release.yml))
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 

.github/ISSUE_TEMPLATE.md

@@ -15,4 +15,4 @@
 
 -
 
-# Notes
+# Notes

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,4 +13,4 @@ Refs #issuenumber
 
 </details>
 
-# Notes
+# Notes

.github/release.yml

@@ -0,0 +1,20 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - major-ver
+    - title: Exciting New Features 🎉
+      labels:
+        - minor-ver
+    - title: Bug Fixes 🐞
+      labels:
+        - patch-ver
+    - title: Database Changes
+      labels:
+        - database-changes
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/base.yaml

@@ -0,0 +1,19 @@
+name: "Build Base"
+run-name: Build Base of ${{ github.ref_name }} by @${{ github.actor }}
+on:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        required: false
+        default: false
+
+jobs:
+  build:
+    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    secrets: inherit
+    with:
+      platforms: "linux/amd64" # "linux/amd64,linux/arm64"
+      target: hyku-base
+      image_name: samvera/hyku/base

.gitignore

@@ -15,6 +15,8 @@ pg_upgrade_*.log
 rerun.txt
 pickle-email-*.html
 *-deploy.yaml
+solr_db_initialized
+fits.log
 
 ## Environment normalization:
 /.bundle

.rspec

@@ -1,2 +1,3 @@
 --color
---require rails_helper
+--require rails_helper
+--exclude-pattern .internal_test_app/**/*

CONTRIBUTING.md

@@ -151,6 +151,7 @@ Common checks that may occur in our repositories:
 
 1. Travis CI - where our automated tests are running
 2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+3. Required Labels - an appropriate [semver](https://semver.org/) label (see [release.yml](https://github.com/samvera/hyku/blob/main/.github/release.yml))
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 

Dockerfile

@@ -20,4 +20,4 @@ CMD ./bin/web
 
 FROM hyku-base as hyku-worker
 ENV MALLOC_ARENA_MAX=2
-CMD ./bin/worker
+CMD ./bin/worker

Gemfile

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.5'
-
 gem 'activerecord-nulldb-adapter'
 # Use sqlite3 as the database for Active Record
 gem 'pg'
@@ -16,7 +14,6 @@ gem 'sass-rails', '~> 5.0'
 gem 'coffee-rails', '~> 4.2'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
-
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
@@ -25,41 +22,34 @@ gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 # bundle exec rake doc:rails generates the API under doc/api.
 # gem 'sdoc', '~> 0.4.0', group: :doc
-
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
-
 gem 'active-fedora', '>= 11.1.4'
 gem 'flutie'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
-
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
   gem 'pry-byebug'
-
   gem 'i18n-debug', require: false
   gem 'i18n-tasks'
   gem 'rspec'
   gem 'rspec-rails', '>= 3.6.0'
-
   gem 'coveralls', '~> 0.8', '>= 0.8.23', require: false
   gem 'simplecov', require: false
-
   gem 'fcrepo_wrapper', '~> 0.4'
   gem 'solr_wrapper', '~> 2.0'
 
-  gem 'rubocop', '~> 0.50', '<= 0.52.1', require: false
-  gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', require: false
-  # sidkiq does not work in development with xray rails. comment it in if you need it
+  gem 'rubocop', '~> 0.50', '<= 0.52.1'
+  gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2'
   # gem 'xray-rails'
 end
 
 group :test do
   gem 'capybara'
   gem 'capybara-screenshot', '~> 1.0'
-  gem 'database_cleaner-active_record'
+  gem 'database_cleaner'
   gem 'factory_bot_rails'
   gem 'launchy'
   # rack-test >= 0.71 does not work with older Capybara versions (< 2.17). See #214 for more details
@@ -75,11 +65,9 @@ group :test do
   gem 'webdrivers', '~> 4.0'
   gem 'webmock'
 end
-
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '>= 3.3.0'
-
   gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'easy_translate'
@@ -88,43 +76,39 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
-# Bulkrax
-gem 'bulkrax', '~> 4.3.0'
+gem 'bulkrax', '~> 5.0'
 
 gem 'blacklight', '~> 6.7'
 gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1'
 
 gem 'hyrax', git: 'https://github.com/samvera/hyrax.git', branch: 'privkey_for_ga4_3.x' #'~> 3.6.0'
 gem 'addressable', '2.8.1'
 gem 'bolognese', '>= 1.9.10'
-gem 'hyrax-doi', git: 'https://github.com/samvera-labs/hyrax-doi.git'#, branch: 'hyrax_upgrade'
+gem 'hyrax-doi', git: 'https://github.com/samvera-labs/hyrax-doi.git', branch: 'hyrax_upgrade'
+gem 'hyrax-iiif_av', git: 'https://github.com/samvera-labs/hyrax-iiif_av.git', branch: 'main'
+gem 'iiif_print', git: 'https://github.com/scientist-softserv/iiif_print.git', branch: 'main'
 gem 'postrank-uri', '>= 1.0.24'
+gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
 gem 'rsolr', '~> 2.0'
 
 gem 'devise'
 gem 'devise-guests', '~> 0.3'
 gem 'devise-i18n'
 gem 'devise_invitable', '~> 1.6'
-
 gem 'apartment'
 gem 'config', '~> 2.2', '>= 2.2.1'
 gem 'is_it_working'
 gem 'rolify'
-
 gem 'flipflop', '~> 2.3'
 gem 'lograge'
-
 gem 'mods', '~> 2.4'
-
 group :aws, :test do
   gem 'carrierwave-aws', '~> 1.3'
 end
-
 group :aws do
   gem 'active_elastic_job'#, git: 'https://github.com/active-elastic-job/active-elastic-job'
   gem 'aws-sdk-sqs'
 end
-
 gem 'activejob-scheduler', git: 'https://github.com/notch8/activejob-scheduler.git'
 gem 'bootstrap-datepicker-rails'
 gem "cocoon"
@@ -142,7 +126,6 @@ gem 'sidekiq'
 gem 'terser' # to support the Safe Navigation / Optional Chaining operator (?.) and avoid uglifier precompile issue
 gem 'tether-rails'
 gem 'progress_bar'
-
 # Pronto adds comments to MRs in gitlab when rubocop offenses are made.
 gem 'pronto'
 gem 'pronto-brakeman', require: false
@@ -153,5 +136,10 @@ gem 'pronto-rubocop', require: false
 
 gem "order_already", "~> 0.3.1"
 gem "redcarpet"
+# When first attempting to upgrade to Hyrax v3.4.2, this dry-monads gem was upgraded to v1.5.0.
+# This version threw the following error:
+# NameError: uninitialized constant Dry::Monads::Result::Transformer
+# Locking it to v1.4.x does not throw an error.
+gem 'dry-monads', '~> 1.4.0'
 gem 'blacklight_range_limit'
 gem "blacklight_advanced_search"