From a493117878ee43af80cdafb45dae5bf22d5bfa2e Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Tue, 5 Nov 2024 16:02:05 -0600 Subject: [PATCH] Rails 5.2 and update staging deploy github action to build from Dockerfile not dual boot -next (#382) --- .github/workflows/deploy_staging.yml | 7 +- Gemfile | 2 +- Gemfile.lock | 98 +++++++++++++++------------- 3 files changed, 56 insertions(+), 51 deletions(-) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 0e82f4dc..173dc3df 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -12,8 +12,7 @@ jobs: uses: zooniverse/ci-cd/.github/workflows/build_and_push_image.yaml@main with: repo_name: talk-api - commit_id: ${{ github.sha }}-next - file: Dockerfile.rails-next + commit_id: ${{ github.sha }} latest: true db_migration_staging: @@ -23,7 +22,7 @@ jobs: with: app_name: talk-api environment: staging - commit_id: ${{ github.sha }}-next + commit_id: ${{ github.sha }} secrets: creds: ${{ secrets.AZURE_AKS }} @@ -34,7 +33,7 @@ jobs: with: app_name: talk-api repo_name: talk-api - commit_id: ${{ github.sha }}-next + commit_id: ${{ github.sha }} environment: staging secrets: creds: ${{ secrets.AZURE_AKS }} diff --git a/Gemfile b/Gemfile index 8522b67b..13cf9b76 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ source 'https://rubygems.org' if next? gem 'rails', '5.2.8.1' else - gem 'rails', '5.1.7' + gem 'rails', '5.2.8.1' end gem 'aws-sdk', '~> 2.3.7' diff --git a/Gemfile.lock b/Gemfile.lock index 253381bd..c5d804be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,46 +12,50 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.1.7) - actionpack (= 5.1.7) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) + websocket-driver (>= 0.6.1) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) - rack (~> 2.0) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.7) - activesupport (= 5.1.7) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.1.7) - activesupport (= 5.1.7) - activerecord (5.1.7) - activemodel (= 5.1.7) - activesupport (= 5.1.7) - arel (~> 8.0) - activesupport (5.1.7) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) + arel (>= 9.0) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) + marcel (~> 1.0.0) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - arel (8.0.0) + arel (9.0.0) aws-sdk (2.3.23) aws-sdk-resources (= 2.3.23) aws-sdk-core (2.3.23) @@ -75,7 +79,7 @@ GEM bigdecimal rexml crass (1.0.6) - date (3.3.4) + date (3.4.0) diff-lcs (1.5.1) docile (1.1.5) domain_name (0.5.20190701) @@ -171,7 +175,7 @@ GEM activesupport (>= 3.0) logstash-event (~> 1.2.0) request_store - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) lumberjack (1.2.10) @@ -180,6 +184,7 @@ GEM net-imap net-pop net-smtp + marcel (1.0.4) method_source (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) @@ -204,7 +209,7 @@ GEM net-protocol netrc (0.11.0) newrelic_rpm (9.12.0) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -222,7 +227,7 @@ GEM activesupport (>= 3.0.0) raabro (1.4.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-cors (1.0.6) rack (>= 1.6.0) rack-protection (3.2.0) @@ -230,17 +235,18 @@ GEM rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) - rails (5.1.7) - actioncable (= 5.1.7) - actionmailer (= 5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) - activemodel (= 5.1.7) - activerecord (= 5.1.7) - activesupport (= 5.1.7) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.1.7) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) @@ -248,12 +254,12 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) @@ -332,9 +338,9 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) strscan (3.1.0) ten_years_rails (0.2.0) @@ -355,7 +361,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.6.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) zoo_stream (1.0.1) @@ -385,7 +391,7 @@ DEPENDENCIES puma pundit (~> 1.1.0) rack-cors (~> 1.0.5) - rails (= 5.1.7) + rails (= 5.2.8.1) redis (~> 3.3.0) restpack_serializer! rspec-its