Skip to content

Commit

Permalink
chore: upgrade to Rails 6.1 and Ruby 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
palkan committed Mar 15, 2021
1 parent f6c8133 commit 510fbab
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 148 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/system_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
bundle-
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.5
- name: Install PostgreSQL 11 client
ruby-version: 2.7.2
- name: Install PostgreSQL client
run: |
sudo apt-get -yqq install libpq-dev
- name: Bundle install
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
postgres:
image: postgres:11.1
ports: ["5432:5432"]
env:
POSTGRES_PASSWORD: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
redis:
image: redis:5.0-alpine
Expand All @@ -34,8 +36,8 @@ jobs:
bundle-
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.5
- name: Install PostgreSQL 11 client
ruby-version: 2.7.2
- name: Install PostgreSQL client
run: |
sudo apt-get -yqq install libpq-dev
- name: Bundle install
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.6.5
ruby-2.7.2
7 changes: 2 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'
ruby '2.7.2'

gem 'rails', '~> 6.0.2', '>= 6.0.2.2'
gem 'rails', '~> 6.1'
gem 'webpacker', '~> 4.0'
gem 'pg', '~> 1.0'
gem 'puma', '~> 4.1'
Expand Down Expand Up @@ -32,9 +32,6 @@ end

group :test do
gem 'capybara'
# Rails system tests couldn't run without it, event though we don't use it
# https://github.com/rails/rails/pull/39179
gem 'selenium-webdriver'
gem 'cuprite'

gem 'test-prof'
Expand Down
Loading

0 comments on commit 510fbab

Please sign in to comment.