Skip to content

Commit 03389e8

Browse files
Merge branch 'development' into aaron/issues/3450
2 parents ae27a0d + 1b34730 commit 03389e8

38 files changed

+1648
-1268
lines changed

.github/workflows/mysql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
3939
# Stub out the Rails credentials file so that we can start the Rails app
4040
- name: 'Setup Credentials'
41-
run: EDITOR='echo "$(cat config/credentials.yml.mysql2)" >' bundle exec rails credentials:edit
41+
run: EDITOR="sh -c 'echo \"$(cat config/credentials.yml.mysql2)\" > \$1' --" bundle exec rails credentials:edit
4242

4343
# Set the path to the wkhtmltopdf executable
4444
- name: 'Determine wkhtmltopdf location'
@@ -54,8 +54,8 @@ jobs:
5454

5555
- name: 'Build out the test database'
5656
run: |
57-
bundle exec rails db:create RAILS_ENV=test
58-
bundle exec rails db:schema:load RAILS_ENV=test
57+
DISABLE_SPRING=1 bundle exec rails db:create RAILS_ENV=test
58+
DISABLE_SPRING=1 bundle exec rails db:schema:load RAILS_ENV=test
5959
6060
- name: 'Run any pending database migrations'
6161
run: bin/rails db:migrate RAILS_ENV=test

.github/workflows/postgres.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: 'Setup Credentials'
6666
run: |
6767
# generate a default credential file and key
68-
EDITOR='echo "$(cat config/credentials.yml.postgresql)" >' bundle exec rails credentials:edit
68+
EDITOR="sh -c 'echo \"$(cat config/credentials.yml.postgresql)\" > \$1' --" bundle exec rails credentials:edit
6969
7070
# Set the path to the wkhtmltopdf executable
7171
- name: 'Determine wkhtmltopdf location'
@@ -79,7 +79,7 @@ jobs:
7979
# Initialize the DB
8080
- name: 'Setup Test DB'
8181
run: |
82-
bundle exec rails db:setup RAILS_ENV=test
82+
DISABLE_SPRING=1 bundle exec rails db:setup RAILS_ENV=test
8383
bundle exec rails db:migrate RAILS_ENV=test
8484
8585
# Prebuild the CSS, JS and image assets

Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ruby '>= 3.0'
99
# ===========#
1010

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

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

50+
# The ultimate text progress bar library for Ruby!
51+
# (https://github.com/jfelchner/ruby-progressbar)
52+
gem 'ruby-progressbar'
53+
54+
# Provides Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline.
55+
# https://github.com/rails/sprockets-rails
56+
gem 'sprockets-rails'
57+
5058
# ============== #
5159
# ERROR HANDLING #
5260
# ============== #

0 commit comments

Comments
 (0)