Skip to content

Commit

Permalink
Upgrade Rails 6.1 to Production (#4171)
Browse files Browse the repository at this point in the history 
* remove -next references to deploy_staging and have build with Dockerfile

* update gemfile rails to 6.1
  • Loading branch information
@yuenmichelle1
yuenmichelle1 authored Mar 31, 2023
1 parent a1dc3b0 commit 7e70275
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 80 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/deploy_staging.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ jobs:
uses: zooniverse/ci-cd/.github/workflows/build_and_push_image.yaml@main
with:
repo_name: panoptes
commit_id: ${{ github.sha }}-next
file: Dockerfile.rails-next
commit_id: ${{ github.sha }}
latest: true

db_migration_staging:
Expand All @@ -23,7 +22,7 @@ jobs:
with:
app_name: panoptes
environment: staging
commit_id: ${{ github.sha }}-next
commit_id: ${{ github.sha }}
secrets:
creds: ${{ secrets.AZURE_AKS }}

Expand All @@ -34,7 +33,7 @@ jobs:
with:
app_name: panoptes
repo_name: panoptes
commit_id: ${{ github.sha }}-next
commit_id: ${{ github.sha }}
environment: staging
secrets:
creds: ${{ secrets.AZURE_AKS }}
Expand All @@ -45,7 +44,7 @@ jobs:
needs: deploy_staging
if: always()
with:
commit_id: ${{ github.sha }}-next
commit_id: ${{ github.sha }}
job_name: Build and Push Image / build_and_push_image
status: ${{ needs.deploy_staging.result }}
title: "Panoptes Staging deploy & migration complete"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ gem 'rack-cors', '~> 1.0', require: 'rack/cors'
if next?
gem 'rails', '~> 6.1'
else
gem 'rails', '~> 6.0'
gem 'rails', '~> 6.1'
end
gem 'ranked-model', '~> 0.4.8'
gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'panoptes-api-version', ref: '5f1ef6c2b2'
Expand Down
151 changes: 77 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,40 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.6.1)
actionpack (= 6.0.6.1)
actioncable (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
actionmailbox (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
mail (>= 2.7.1)
actionmailer (6.0.6.1)
actionpack (= 6.0.6.1)
actionview (= 6.0.6.1)
activejob (= 6.0.6.1)
actionmailer (6.1.7.3)
actionpack (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activesupport (= 6.1.7.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.6.1)
actionview (= 6.0.6.1)
activesupport (= 6.0.6.1)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.7.3)
actionview (= 6.1.7.3)
activesupport (= 6.1.7.3)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.6.1)
actionpack (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
actiontext (6.1.7.3)
actionpack (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
nokogiri (>= 1.8.5)
actionview (6.0.6.1)
activesupport (= 6.0.6.1)
actionview (6.1.7.3)
activesupport (= 6.1.7.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -59,27 +61,29 @@ GEM
active_record_extended (3.2.1)
activerecord (>= 5.2, < 7.2.0)
pg (< 3.0)
activejob (6.0.6.1)
activesupport (= 6.0.6.1)
activejob (6.1.7.3)
activesupport (= 6.1.7.3)
globalid (>= 0.3.6)
activemodel (6.0.6.1)
activesupport (= 6.0.6.1)
activerecord (6.0.6.1)
activemodel (= 6.0.6.1)
activesupport (= 6.0.6.1)
activemodel (6.1.7.3)
activesupport (= 6.1.7.3)
activerecord (6.1.7.3)
activemodel (= 6.1.7.3)
activesupport (= 6.1.7.3)
activerecord-import (1.4.1)
activerecord (>= 4.2)
activestorage (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activesupport (= 6.1.7.3)
marcel (~> 1.0)
activesupport (6.0.6.1)
mini_mime (>= 1.1.0)
activesupport (6.1.7.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
aggregate (0.2.3)
Expand Down Expand Up @@ -125,7 +129,7 @@ GEM
deep_cloneable (3.2.0)
activerecord (>= 3.1.0, < 8)
deprecate (0.0.0)
devise (4.9.0)
devise (4.9.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
Expand Down Expand Up @@ -195,7 +199,7 @@ GEM
raabro (~> 1.4)
globalid (1.1.0)
activesupport (>= 5.0)
graphiql-rails (1.8.0)
graphiql-rails (1.9.0)
railties
sprockets-rails
graphql (2.0.17)
Expand Down Expand Up @@ -352,32 +356,32 @@ GEM
rack
rack-test (2.0.2)
rack (>= 1.3)
rails (6.0.6.1)
actioncable (= 6.0.6.1)
actionmailbox (= 6.0.6.1)
actionmailer (= 6.0.6.1)
actionpack (= 6.0.6.1)
actiontext (= 6.0.6.1)
actionview (= 6.0.6.1)
activejob (= 6.0.6.1)
activemodel (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
bundler (>= 1.3.0)
railties (= 6.0.6.1)
rails (6.1.7.3)
actioncable (= 6.1.7.3)
actionmailbox (= 6.1.7.3)
actionmailer (= 6.1.7.3)
actionpack (= 6.1.7.3)
actiontext (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activemodel (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
bundler (>= 1.15.0)
railties (= 6.1.7.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
railties (6.0.6.1)
actionpack (= 6.0.6.1)
activesupport (= 6.0.6.1)
railties (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.6)
ranked-model (0.4.8)
Expand Down Expand Up @@ -413,14 +417,14 @@ GEM
rspec-mocks (3.12.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (5.1.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-rails (6.0.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.11)
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-support (3.12.0)
rubocop (0.91.1)
parallel (~> 1.10)
Expand Down Expand Up @@ -480,18 +484,17 @@ GEM
standby (4.0.0)
activerecord (>= 3.0.0)
stringex (2.8.5)
strong_migrations (0.7.9)
activerecord (>= 5)
strong_migrations (1.4.4)
activerecord (>= 5.2)
ten_years_rails (0.2.0)
actionview
activesupport
colorize (>= 0.8.1)
rest-client (>= 2.0.2)
thor (1.2.1)
thread_safe (0.3.6)
timeout (0.3.2)
tzinfo (1.2.11)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
Expand Down Expand Up @@ -566,7 +569,7 @@ DEPENDENCIES
puma (~> 6.1.1)
pundit (~> 2.3.0)
rack-cors (~> 1.0)
rails (~> 6.0)
rails (~> 6.1)
ranked-model (~> 0.4.8)
restpack_serializer!
rspec
Expand Down

0 comments on commit 7e70275

Please sign in to comment.