Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Rails and migrate from que to good_job #610

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
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
6 changes: 3 additions & 3 deletions .github/workflows/slovensko_digital_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

services:
postgres:
image: postgres:12-alpine
image: postgres:14-alpine
env:
POSTGRES_USER: runner
POSTGRES_HOST_AUTH_METHOD: trust
Expand All @@ -35,9 +35,9 @@ jobs:
- run: bundle exec rails webpacker:compile
env:
NODE_OPTIONS: "--openssl-legacy-provider"
- run: bundle exec rails db:create db:structure:load --trace
- run: bundle exec rails db:test:prepare --trace

- uses: paambaati/codeclimate-action@v2.7.5
- uses: paambaati/codeclimate-action@v5.0.0
env:
CC_TEST_REPORTER_ID: 17d259e00bbff5b020b7f1a6abb6736e0f65b9a517afdcbaeaa79e919730835f
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/auto-deploy-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ workers:
memory: 300Mi
worker:
replicaCount: "1"
command: ["bundle", "exec", "que", "-w1", "./config/environment.rb"]
command: ["bundle", "exec", "good_job", "start"]
terminationGracePeriodSeconds: 60
livenessProbe:
initialDelaySeconds: 5
Expand Down
14 changes: 8 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.2.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.7.3'
gem 'rails', '~> 7.0.8'
gem 'rails-i18n'
# Use postgresql as the database for Active Record
gem 'pg'
Expand Down Expand Up @@ -34,7 +34,10 @@ gem 'jbuilder'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Gems for tracking the statuses of jobs
# Workers
gem 'good_job'

# Remove after migration to good_job
gem 'que'
gem 'que-web'

Expand Down Expand Up @@ -80,7 +83,7 @@ group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'dotenv-rails'
gem 'factory_bot_rails'
gem 'rspec-rails', '4.0.2'
gem 'rspec-rails'
gem 'rspec_junit_formatter'
gem 'faker'
end
Expand All @@ -100,9 +103,8 @@ group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', "~> 3.39.2"
gem 'show_me_the_cookies'
gem 'selenium-webdriver', "~> 4.9.0"
gem "webdrivers", "= 5.3.0"
gem 'simplecov', '< 0.18' # https://github.com/codeclimate/test-reporter/issues/413
gem 'selenium-webdriver', "~> 4.13"
gem 'simplecov', '~> 0.22.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
Loading
Loading