Skip to content

Commit

Permalink
Merge branch 'development' into aaron/issues/3450
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminfaure authored Nov 18, 2024
2 parents ae27a0d + 1b34730 commit 03389e8
Show file tree
Hide file tree
Showing 38 changed files with 1,648 additions and 1,268 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# Stub out the Rails credentials file so that we can start the Rails app
- name: 'Setup Credentials'
run: EDITOR='echo "$(cat config/credentials.yml.mysql2)" >' bundle exec rails credentials:edit
run: EDITOR="sh -c 'echo \"$(cat config/credentials.yml.mysql2)\" > \$1' --" bundle exec rails credentials:edit

# Set the path to the wkhtmltopdf executable
- name: 'Determine wkhtmltopdf location'
Expand All @@ -54,8 +54,8 @@ jobs:

- name: 'Build out the test database'
run: |
bundle exec rails db:create RAILS_ENV=test
bundle exec rails db:schema:load RAILS_ENV=test
DISABLE_SPRING=1 bundle exec rails db:create RAILS_ENV=test
DISABLE_SPRING=1 bundle exec rails db:schema:load RAILS_ENV=test
- name: 'Run any pending database migrations'
run: bin/rails db:migrate RAILS_ENV=test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: 'Setup Credentials'
run: |
# generate a default credential file and key
EDITOR='echo "$(cat config/credentials.yml.postgresql)" >' bundle exec rails credentials:edit
EDITOR="sh -c 'echo \"$(cat config/credentials.yml.postgresql)\" > \$1' --" bundle exec rails credentials:edit
# Set the path to the wkhtmltopdf executable
- name: 'Determine wkhtmltopdf location'
Expand All @@ -79,7 +79,7 @@ jobs:
# Initialize the DB
- name: 'Setup Test DB'
run: |
bundle exec rails db:setup RAILS_ENV=test
DISABLE_SPRING=1 bundle exec rails db:setup RAILS_ENV=test
bundle exec rails db:migrate RAILS_ENV=test
# Prebuild the CSS, JS and image assets
Expand Down
10 changes: 9 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ruby '>= 3.0'
# ===========#

# Full-stack web application framework. (http://rubyonrails.org)
gem 'rails', '~> 6.1'
gem 'rails', '~> 7.1'

# TODO: Remove this once Rails addresses the issue with its dependency on mimemagic. Mimemagic had
# an MIT license but was using some incompatible GPL license code.
Expand Down Expand Up @@ -47,6 +47,14 @@ gem 'jbuilder'
# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', require: false

# The ultimate text progress bar library for Ruby!
# (https://github.com/jfelchner/ruby-progressbar)
gem 'ruby-progressbar'

# Provides Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline.
# https://github.com/rails/sprockets-rails
gem 'sprockets-rails'

# ============== #
# ERROR HANDLING #
# ============== #
Expand Down
Loading

0 comments on commit 03389e8

Please sign in to comment.