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 to Ruby 3.0 and Ubuntu 22.04 #24

Closed
wants to merge 1 commit into from
Closed
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
3 changes: 2 additions & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ runs:
shell: bash
run: |
gem install bundler -v 2.3.27
bundle install --jobs 4 --retry 3 --path vendor/bundle
bundle config set --local path 'vendor/bundle'
bundle install --jobs 4 --retry 3

- name: Setup database
shell: bash
Expand Down
96 changes: 48 additions & 48 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
bundle-audit:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -32,15 +32,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -50,7 +50,7 @@ jobs:
bundle exec rake bundle:audit

brakeman:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -74,15 +74,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -92,7 +92,7 @@ jobs:
bundle exec rake brakeman:check

spec-admin-controllers:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -116,15 +116,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -138,7 +138,7 @@ jobs:
bundle exec rake spec:controllers

spec-public-controllers:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -162,15 +162,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -184,7 +184,7 @@ jobs:
bundle exec rake spec:controllers

spec-jobs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -208,15 +208,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -230,7 +230,7 @@ jobs:
bundle exec rake spec:jobs

spec-mailers:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -254,15 +254,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -276,7 +276,7 @@ jobs:
bundle exec rake spec

spec-models:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -300,15 +300,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -322,7 +322,7 @@ jobs:
bundle exec rake spec

spec-requests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -346,15 +346,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -368,7 +368,7 @@ jobs:
bundle exec rake spec

spec-other:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -392,15 +392,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -414,7 +414,7 @@ jobs:
bundle exec rake spec

javascript:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -438,15 +438,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -459,7 +459,7 @@ jobs:
bundle exec rake jasmine:ci

cucumber-admin:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -483,15 +483,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -506,7 +506,7 @@ jobs:
bundle exec rake cucumber

cucumber-public:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -530,15 +530,15 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"

- name: Setup gem cache
uses: actions/cache@v4
with:
path: vendor/bundle
key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
restore-keys: |
ubuntu-20.04-gems-
ubuntu-22.04-gems-

- name: Setup
uses: ./.github/actions/setup
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'dotenv-rails', require: 'dotenv/rails-now'
gem 'rails', '6.1.7.7'

gem 'rake'
gem 'pg'
gem 'pg', '< 1.5'
gem 'authlogic'
gem 'will_paginate'
gem 'json'
Expand Down Expand Up @@ -34,6 +34,7 @@ gem 'image_processing'
gem 'maxminddb'
gem 'redcarpet'
gem 'scrypt'
gem 'webrick'

gem 'aws-sdk-codedeploy'
gem 'aws-sdk-cloudwatchlogs'
Expand Down
Loading