From bb248a7032e62f843263c0b9e38ef31c9329aae9 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Fri, 22 Nov 2024 10:45:24 +0000 Subject: [PATCH 1/3] bump to_bulkrax 8.0.0 (requires rails bulkrax:update_status_messages --- Gemfile | 4 +++- Gemfile.lock | 13 ++++++++----- config/initializers/bulkrax.rb | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index c5b76580..924483ca 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,9 @@ end # Bulkrax :: Upgrading passed this point might cause issues, for now we've made a # branch off v5.3.1 that includes `DownloadCloudFileJob` work. -gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', branch: '5.3.1-british_library' +#gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', branch: '5.3.1-british_library' +gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', tag: 'v8.0.0' + gem 'blacklight', '~> 6.7' gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 07e51e78..7c54ac21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,18 +41,19 @@ GIT GIT remote: https://github.com/samvera/bulkrax - revision: 8c37b0d062ad362075e1912e3192da681e19713a - branch: 5.3.1-british_library + revision: 97abce11dce209dc325acb0f87e81753ffd65317 + tag: v8.0.0 specs: - bulkrax (5.3.1) - bagit (~> 0.4) + bulkrax (8.0.0) + bagit (~> 0.4.6) coderay - dry-monads (~> 1.4.0) + denormalize_fields iso8601 (~> 0.9.0) kaminari language_list (~> 1.2, >= 1.2.1) libxml-ruby (~> 3.2.4) loofah (>= 2.2.3) + marcel oai (>= 0.4, < 2.x) rack (>= 2.0.6) rails (>= 5.1.6) @@ -398,6 +399,8 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) declarative (0.0.20) + denormalize_fields (1.3.0) + activerecord (>= 4.1.14, < 8.0.0) deprecation (1.1.0) activesupport devise (4.8.0) diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb index 0f7cbf18..88a17d5c 100644 --- a/config/initializers/bulkrax.rb +++ b/config/initializers/bulkrax.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true if ENV.fetch('HYKU_BULKRAX_ENABLED', false) + Bulkrax.object_factory = Bulkrax::ObjectFactory + # rubocop:disable Metrics/BlockLength Bulkrax.setup do |config| # Add local parsers From 7213bdbb8c0d0be529212239428133463280a9c9 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Tue, 10 Dec 2024 15:24:39 +0000 Subject: [PATCH 2/3] run bundle as we've updated bulkrax --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 046eafaf..7a511d0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -140,7 +140,7 @@ services: ## With the following line, uncommented during active development, we'll ## run bundle then boot the web-server. ## - # command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000" + command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000" ## ## Similar to the above, except we will bundle and then tell the container ## to wait. You'll then need to bash into the web container and start the From c604d2f05d07be722dfdee56927e3010b9e40996 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Tue, 7 Jan 2025 11:57:32 +0000 Subject: [PATCH 3/3] quick revert of Bulkrax to see if staging build happens (wasn't when bumped to 8) --- Gemfile | 7 ++++--- Gemfile.lock | 15 ++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 924483ca..6cff2a43 100644 --- a/Gemfile +++ b/Gemfile @@ -100,10 +100,11 @@ group :development do # gem 'xray-rails' # when using this gem, know that sidekiq will not work end -# Bulkrax :: Upgrading passed this point might cause issues, for now we've made a +# Bulkrax :: Upgrading past this point might cause issues, for now we've made a # branch off v5.3.1 that includes `DownloadCloudFileJob` work. -#gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', branch: '5.3.1-british_library' -gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', tag: 'v8.0.0' +gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', branch: '5.3.1-british_library' +# DownloadCloudFileJob included in Bulkrax >= 8.0.0 +#gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', tag: 'v8.0.0' gem 'blacklight', '~> 6.7' diff --git a/Gemfile.lock b/Gemfile.lock index 7c54ac21..977b01b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,19 +41,18 @@ GIT GIT remote: https://github.com/samvera/bulkrax - revision: 97abce11dce209dc325acb0f87e81753ffd65317 - tag: v8.0.0 + revision: 8c37b0d062ad362075e1912e3192da681e19713a + branch: 5.3.1-british_library specs: - bulkrax (8.0.0) - bagit (~> 0.4.6) + bulkrax (5.3.1) + bagit (~> 0.4) coderay - denormalize_fields + dry-monads (~> 1.4.0) iso8601 (~> 0.9.0) kaminari language_list (~> 1.2, >= 1.2.1) libxml-ruby (~> 3.2.4) loofah (>= 2.2.3) - marcel oai (>= 0.4, < 2.x) rack (>= 2.0.6) rails (>= 5.1.6) @@ -258,7 +257,7 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bagit (0.4.6) + bagit (0.6.0) docopt (~> 0.5.0) validatable (~> 1.6) bcp47 (0.3.3) @@ -399,8 +398,6 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) declarative (0.0.20) - denormalize_fields (1.3.0) - activerecord (>= 4.1.14, < 8.0.0) deprecation (1.1.0) activesupport devise (4.8.0)