Skip to content
Merged
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
27 changes: 26 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ on:
jobs:
test:
runs-on: ubuntu-latest

services:
postgres:
image: postgres
env:
POSTGRES_USER: propro_test
POSTGRES_PASSWORD: propro_test
POSTGRES_DB: propro_test
ports:
- 5432:5432
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5

steps:
- uses: actions/checkout@v4

Expand All @@ -19,13 +35,22 @@ jobs:
run: bin/rails db:schema:load
env:
RAILS_ENV: test
PGHOST: 127.0.0.1
PGUSER: propro_test
PGPASSWORD: propro_test

- name: Run tests
run: bin/rails test
env:
RAILS_ENV: test
PGHOST: 127.0.0.1
PGUSER: propro_test
PGPASSWORD: propro_test

- name: Run system tests
run: bin/rails test:system
env:
RAILS_ENV: test
RAILS_ENV: test
PGHOST: 127.0.0.1
PGUSER: propro_test
PGPASSWORD: propro_test
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.4.7
ruby-3.4.10
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
source 'https://rubygems.org'
ruby '3.4.7'
ruby '3.4.10'

gem 'csv', require: false
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '>= 8.0.2'
# The modern asset pipeline for Rails [https://github.com/rails/propshaft]
gem 'propshaft'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '>= 2.1'
# Use postgres as the database for Active Record
gem 'pg'
# Use the Puma web server [https://github.com/puma/puma]
gem 'puma', '>= 5.0'
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
Expand Down
17 changes: 8 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ GEM
parser (3.3.8.0)
ast (~> 2.4.1)
racc
pg (1.6.3)
pg (1.6.3-aarch64-linux)
pg (1.6.3-aarch64-linux-musl)
pg (1.6.3-arm64-darwin)
pg (1.6.3-x86_64-linux)
pg (1.6.3-x86_64-linux-musl)
pp (0.6.2)
prettyprint
prettier_print (1.2.1)
Expand Down Expand Up @@ -320,13 +326,6 @@ GEM
railties (>= 7.1)
thor (>= 1.3.1)
sqids (0.2.2)
sqlite3 (2.7.2-aarch64-linux-gnu)
sqlite3 (2.7.2-aarch64-linux-musl)
sqlite3 (2.7.2-arm-linux-gnu)
sqlite3 (2.7.2-arm-linux-musl)
sqlite3 (2.7.2-arm64-darwin)
sqlite3 (2.7.2-x86_64-linux-gnu)
sqlite3 (2.7.2-x86_64-linux-musl)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.7)
Expand Down Expand Up @@ -401,6 +400,7 @@ DEPENDENCIES
htmldiff
importmap-rails
jbuilder
pg
propshaft
puma (>= 5.0)
pundit (~> 2.5)
Expand All @@ -410,7 +410,6 @@ DEPENDENCIES
selenium-webdriver
solid_queue
sqids (~> 0.2.2)
sqlite3 (>= 2.1)
stimulus-rails
tailwindcss-rails (~> 4.3)
thruster
Expand All @@ -419,7 +418,7 @@ DEPENDENCIES
web-console

RUBY VERSION
ruby 3.4.7p58
ruby 3.4.10p104

BUNDLED WITH
2.6.7
82 changes: 41 additions & 41 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
# SQLite. Versions 3.8.0 and up are supported.
# gem install sqlite3
#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem "sqlite3"
#
default: &default
adapter: sqlite3
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
timeout: 5000
development:
<<: *default
database: storage/development.sqlite3
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
database: storage/test.sqlite3
# Store production database in the storage/ directory, which by default
# is mounted as a persistent Docker volume in config/deploy.yml.
production:
primary:
<<: *default
database: storage/production.sqlite3
cache:
<<: *default
database: storage/production_cache.sqlite3
migrations_paths: db/cache_migrate
queue:
<<: *default
database: storage/production_queue.sqlite3
migrations_paths: db/queue_migrate
cable:
<<: *default
database: storage/production_cable.sqlite3
migrations_paths: db/cable_migrate
# SQLite. Versions 3.8.0 and up are supported.
# gem install sqlite3
#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem "sqlite3"
#
default: &default
adapter: postgresql
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
timeout: 5000

development:
<<: *default
database: propro_development

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
database: propro_test


# Store production database in the storage/ directory, which by default
# is mounted as a persistent Docker volume in config/deploy.yml.
production:
primary:
<<: *default
database: storage/production.sqlite3
cache:
<<: *default
database: storage/production_cache.sqlite3
migrations_paths: db/cache_migrate
queue:
<<: *default
database: storage/production_queue.sqlite3
migrations_paths: db/queue_migrate
cable:
<<: *default
database: storage/production_cable.sqlite3
migrations_paths: db/cable_migrate
Loading