Skip to content

Commit

Permalink
Merge pull request #2123 from cul-it/DACCESS-313
Browse files Browse the repository at this point in the history
DACCESS-313 - resolve build issues
  • Loading branch information
jgreidy authored May 29, 2024
2 parents f6babef + f736f2c commit d36b3c1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions blacklight-cornell/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,4 @@ gem 'puma', '~> 6.4', '>= 6.4.2'
gem 'aws-sdk-s3', '~> 1.143'
gem 'uri', '0.12.2'
# gem 'pkg-config', '1.5.4'
gem 'concurrent-ruby', '1.2.3', require: 'concurrent'
6 changes: 6 additions & 0 deletions blacklight-cornell/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ GEM
ffi (>= 1.0.11)
library_stdnums (1.6.0)
libv8-node (16.10.0.0-aarch64-linux)
libv8-node (16.10.0.0-arm64-darwin)
libv8-node (16.10.0.0-x86_64-darwin)
libv8-node (16.10.0.0-x86_64-linux)
listen (3.9.0)
Expand Down Expand Up @@ -552,6 +553,8 @@ GEM
nio4r (2.7.1)
nokogiri (1.16.4-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.4-x86_64-linux)
Expand Down Expand Up @@ -760,6 +763,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.7.3-aarch64-linux)
sqlite3 (1.7.3-arm64-darwin)
sqlite3 (1.7.3-x86_64-darwin)
sqlite3 (1.7.3-x86_64-linux)
sshkit (1.22.2)
Expand Down Expand Up @@ -841,6 +845,7 @@ GEM

PLATFORMS
aarch64-linux
arm64-darwin-23
x86_64-darwin-23
x86_64-linux

Expand Down Expand Up @@ -873,6 +878,7 @@ DEPENDENCIES
citeproc
citeproc-ruby
coffee-rails (~> 4.0)
concurrent-ruby (= 1.2.3)
csl-styles!
cucumber (~> 3.1)
cucumber-rails
Expand Down
1 change: 1 addition & 0 deletions blacklight-cornell/Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env rake
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require 'bundler/setup'

require File.expand_path('../config/application', __FILE__)

Expand Down
1 change: 1 addition & 0 deletions jenkins/prelude.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ gem install bundler -v 2.3.26
cd blacklight-cornell
bundle update blacklight_unapi blacklight_cornell_requests my_account sqlite3
bundle install
bundle info concurrent-ruby
RAILS_ENV=test bin/rake db:migrate
brakeman --fast -o brakeman-output.json
echo $RAILS_ENV
Expand Down

0 comments on commit d36b3c1

Please sign in to comment.