Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ jobs:
- name: Validate database migrations
env:
RAILS_ENV: production
SECRET_KEY_BASE: dummy
Comment thread
awilfox marked this conversation as resolved.
Outdated
DISABLE_DATABASE_ENVIRONMENT_CHECK: 1
run: rails --trace db:drop db:create db:migrate
run: bundle exec rails --trace db:drop db:create db:migrate

- name: Upload artifacts
if: ${{ always() }}
Expand Down
5 changes: 3 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
require:
plugins:
- rubocop-rails

AllCops:
TargetRailsVersion: 8.0
UseCache: false
Exclude:
# Exclude generated files
Expand Down Expand Up @@ -185,7 +186,7 @@ Lint/TripleQuotes: # (new in 1.9)
Enabled: true
Style/IfWithBooleanLiteralBranches: # (new in 1.9)
Enabled: true
Gemspec/DateAssignment: # (new in 1.10)
Gemspec/DeprecatedAttributeAssignment:
Enabled: true
Style/HashConversion: # (new in 1.10)
Enabled: true
Expand Down
17 changes: 9 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ RUN mkdir -p /opt/app \
# ------------------------------------------------------------
# Install packages common to dev and prod.

# Get list of available packages
RUN apt-get update -qq

# Install standard packages from the Debian repository
RUN apt-get install -y --no-install-recommends \
RUN apt-get update -qq && apt-get install -y --no-install-recommends \
libpq-dev \
libvips42
libvips42 \
libyaml-dev \
pkg-config \
&& rm -rf /var/lib/apt/lists/*

# ------------------------------------------------------------
# Run configuration
Expand Down Expand Up @@ -75,10 +75,11 @@ FROM base AS development
USER root

# Install system packages needed to build gems with C extensions.
RUN apt-get install -y --no-install-recommends \
RUN apt-get update -qq && apt-get install -y --no-install-recommends \
gcc \
g++ \
make
make \
&& rm -rf /var/lib/apt/lists/*

# ------------------------------------------------------------
# Install Ruby gems
Expand All @@ -87,7 +88,7 @@ RUN apt-get install -y --no-install-recommends \
USER $APP_USER

# Base image ships with an older version of bundler
RUN gem install bundler --version 2.5.22
RUN gem install bundler --version 2.7.2

# Install gems. We don't enforce the validity of the Gemfile.lock until the
# final (production) stage.
Expand Down
30 changes: 16 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ ruby '~> 3.3'

gem 'berkeley_library-alma', '~> 0.1.1'
gem 'berkeley_library-logging', '~> 0.3'
gem 'berkeley_library-util', '~> 0.2.0'
gem 'berkeley_library-util', '~> 0.3'
gem 'drb'
gem 'image_processing', '~> 1.12'
gem 'jsonapi.rb', '~> 2.0'
gem 'jsonapi-serializer', '~> 2.2'
gem 'jwt', '~> 2.4'
gem 'mutex_m'
gem 'omniauth', '~> 1.9', '>= 1.9.2'
gem 'omniauth-cas', '~> 2.0'
gem 'omniauth', '~> 2.1'
gem 'omniauth-cas', '~> 3.0'
gem 'omniauth-rails_csrf_protection', '~> 1.0'
gem 'pg', '~> 1.4'
gem 'pg_search', '~> 2.3'
gem 'puma', '~> 5.0'
gem 'puma', '~> 7.2'
gem 'rack-cors'
gem 'rails', '~> 7.0.4'
gem 'ransack', '~> 2.6'
gem 'rails', '~> 8.0.4'
Comment thread
awilfox marked this conversation as resolved.
Outdated
gem 'ransack', '~> 4.2'
gem 'zaru', '~> 0.3.0'

group :development, :test do
Expand All @@ -30,19 +31,20 @@ end

group :development do
gem 'hashdiff', '~> 1.0.1'
gem 'rubocop', '~> 1.26.0'
gem 'rubocop-rails', '~> 2.13.2', require: false
gem 'rubocop-rspec', '~> 2.4.0', require: false
gem 'rubocop', '~> 1.86'
gem 'rubocop-rails', '~> 2.34', require: false
gem 'rubocop-rspec', '~> 3.6', require: false
gem 'rubocop-rspec_rails', '~> 2.30', require: false
end

group :test do
gem 'database_cleaner-active_record', '~> 2.0'
gem 'factory_bot_rails'
gem 'rails-controller-testing'
gem 'rspec', '~> 3.10'
gem 'rspec_junit_formatter', '~> 0.5'
gem 'rspec-rails', '~> 5.0'
gem 'simplecov', '~> 0.21', require: false
gem 'simplecov-rcov', '~> 0.2', require: false
gem 'rspec', '~> 3.13'
gem 'rspec_junit_formatter', '~> 0.6'
gem 'rspec-rails', '~> 8.0'
gem 'simplecov', '~> 0.22', require: false
gem 'simplecov-rcov', '~> 0.3', require: false
gem 'webmock', require: false
end
Loading
Loading