Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ jobs:
uses: actions/[email protected]
with:
path: vendor/bundle
key: ${{ matrix.ruby }}
key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-bundle-${{ matrix.ruby }}-
${{ runner.os }}-bundle-

- name: Setup Ruby
uses: ruby/[email protected]
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ else
end

gem 'oai'
gem 'pg'
gem 'rsolr', '>= 1.0'
gem 'rspec-rails'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
Expand Down
7 changes: 2 additions & 5 deletions app/factories/bulkrax/valkyrie_object_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ def uploaded_remote_files(remote_files: [])
remote_files.map do |r|
file_path = download_file(r["url"])
next unless file_path

create_uploaded_file(file_path, r["file_name"])
end.compact
end
Expand All @@ -449,8 +448,7 @@ def download_file(url)
file.rewind
file.path
rescue => e
Rails.logger.debug "Failed to download file from #{url}: #{e.message}"
nil
raise "Failed to download file from #{url}: #{e.message}"
end
end

Expand All @@ -460,8 +458,7 @@ def create_uploaded_file(file_path, file_name)
file.close
uploaded_file
rescue => e
Rails.logger.debug "Failed to create Hyrax::UploadedFile for #{file_name}: #{e.message}"
nil
raise "Failed to create Hyrax::UploadedFile for #{file_name}: #{e.message}"
end

# @Override Destroy existing files with Hyrax::Transactions
Expand Down