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

rails 7 upgrade #2316

Open
wants to merge 3 commits into
base: main
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions .circleci/config.yml
@@ -1,5 +1,5 @@
# To bump cache:
# Increment & Replace: 'CACHE_V3' in this config
# Increment & Replace: 'CACHE7_V1' in this config

# NB: It would be great to use Pipeline parameters instead of search and replacing the cache key
# ... but that doesn't work with this config version, and workflows don't work with version 2.1
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

- type: cache-restore
name: "Dockerize: cache restore"
key: CACHE_V3-dockerize-0.6.1
key: CACHE7_V1-dockerize-0.6.1

- run:
name: "Dockerize: install"
Expand All @@ -82,13 +82,13 @@ jobs:

- type: cache-save
name: "Dockerize: cache save"
key: CACHE_V3-dockerize-0.6.1
key: CACHE7_V1-dockerize-0.6.1
paths:
- ~/.cache/dockerize

- type: cache-restore
name: "Git: cache restore"
key: CACHE_V3-git-2.22.0
key: CACHE7_V1-git-2.22.0

- run:
name: "Git: install"
Expand Down Expand Up @@ -123,13 +123,13 @@ jobs:

- type: cache-save
name: "Git: cache save"
key: CACHE_V3-git-2.22.0
key: CACHE7_V1-git-2.22.0
paths:
- ~/.cache/git/git-2.22.0

- type: cache-restore
name: "Hub: cache restore"
key: CACHE_V3-hub-2.12.3
key: CACHE7_V1-hub-2.12.3

- run:
name: "Hub: install"
Expand All @@ -153,7 +153,7 @@ jobs:

- type: cache-restore
name: "Hub: cache save"
key: CACHE_V3-hub-2.12.3
key: CACHE7_V1-hub-2.12.3
paths:
- ~/.cache/hub

Expand All @@ -163,7 +163,7 @@ jobs:

- type: cache-restore
name: "Ruby dependencies: cache restore"
key: CACHE_V3-gems-{{ checksum "Gemfile.lock" }}
key: CACHE7_V1-gems-{{ checksum "Gemfile.lock" }}

- run:
name: "Ruby dependencies: install"
Expand All @@ -174,7 +174,7 @@ jobs:

- type: cache-save
name: "Ruby dependencies: cache save"
key: CACHE_V3-gems-{{ checksum "Gemfile.lock" }}
key: CACHE7_V1-gems-{{ checksum "Gemfile.lock" }}
paths:
- ~/.cache/bundle

Expand All @@ -184,7 +184,7 @@ jobs:

- type: cache-restore
name: "Node dependencies: cache restore"
key: CACHE_V3-yarn-{{ checksum "yarn.lock" }}
key: CACHE7_V1-yarn-{{ checksum "yarn.lock" }}

- run:
name: "Node dependencies: install"
Expand All @@ -195,13 +195,13 @@ jobs:

- type: cache-save
name: "Node dependencies: cache save"
key: CACHE_V3-yarn-{{ checksum "yarn.lock" }}
key: CACHE7_V1-yarn-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn

- type: cache-restore
name: "Assets: cache restore"
key: CACHE_V3-assets-{{ .Environment.CIRCLE_SHA1 }}
key: CACHE7_V1-assets-{{ .Environment.CIRCLE_SHA1 }}

- run:
name: "Assets: precompile"
Expand All @@ -213,7 +213,7 @@ jobs:

- type: cache-save
name: "Assets: cache save"
key: CACHE_V3-assets-{{ .Environment.CIRCLE_SHA1 }}
key: CACHE7_V1-assets-{{ .Environment.CIRCLE_SHA1 }}
paths:
- .sass-cache
- public/assets
Expand All @@ -235,7 +235,7 @@ jobs:
- run:
name: Setup Database
command: |
bundle exec rails db:structure:load --trace
bundle exec rails db:schema:load --trace

- run:
name: RSpec
Expand Down
2 changes: 1 addition & 1 deletion .cloud66/deploy_hooks.yml
@@ -1,5 +1,5 @@
production:
# Install postgres 13 client, to be enable db:structure:load
# Install postgres 13 client, to be enable db:schema:load
first_thing:
- command: sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - && sudo apt-get update && sudo apt-get -y install postgresql-13
target: rails
Expand Down
3 changes: 1 addition & 2 deletions Gemfile
Expand Up @@ -8,7 +8,7 @@ git_source(:gitlab) { |repo| "https://gitlab.com/#{repo}.git" }
# Update CircleCI config if Ruby version is bumped
ruby "2.7.6"
gem "rack", "2.2.3"
gem "rails", "~> 6.0"
gem "rails", "~> 7.0"

gem "puma" # App server
gem "bcrypt", "~> 3.1.7" # encryption
Expand All @@ -25,7 +25,6 @@ gem "multi_json" # TODO: use this more

# Feature flagging
gem "flipper"
gem "flipper-active_record"
gem "flipper-ui"

# I18n - localization/translation
Expand Down