Skip to content

Commit

Permalink
Merge branch 'stages/rc-2024-10-01' into 'stages/prod'
Browse files Browse the repository at this point in the history
Deploy RC 79 to Prod

See merge request lg/identity-pki!26
  • Loading branch information
eileen-nava committed Oct 1, 2024
2 parents c92bec0 + 033ebfd commit d30efe7
Show file tree
Hide file tree
Showing 16 changed files with 224 additions and 253 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ build-prod-pivcac-image:
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
BRANCH_TAGGING_STRING: "--destination ${ECR_REGISTRY}/identity-pivcac/review:main"
BRANCH_TAGGING_STRING: "--destination ${ECR_REGISTRY}/identity-pivcac/pivcac:main"
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE != "merge_request_event"
when: never
Expand Down Expand Up @@ -260,7 +260,7 @@ build-prod-nginx-image:
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
BRANCH_TAGGING_STRING: "--destination ${ECR_REGISTRY}/identity-pivcac/review:main"
BRANCH_TAGGING_STRING: "--destination ${ECR_REGISTRY}/identity-pivcac/nginx:main"
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE != "merge_request_event"
when: never
Expand Down
15 changes: 5 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

ruby '~> 3.3'

gem 'rails', '~> 7.0.8.3'
gem 'rails', '~> 7.1.0'

gem 'activerecord-import', '>= 1.0.2'
# pod identity requires 3.188.0
# https://docs.aws.amazon.com/eks/latest/userguide/pod-id-minimum-sdk.html
gem 'aws-sdk-core', '>= 3.188.0'
gem 'aws-sdk-s3'
gem 'bloomfilter-rb'
gem 'csv'
gem 'redis'
gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v4.0.0'
gem 'identity-logging', github: '18F/identity-logging', tag: 'v0.1.0'
gem 'mini_cache'
Expand All @@ -23,11 +25,11 @@ gem 'redacted_struct', '~> 2.0'
gem 'rgl'

group :development, :test do
gem 'bullet', '~> 7.0'
gem 'bullet', '~> 7.1.2'
gem 'brakeman', require: false
gem 'listen'
gem 'pry-byebug'
gem 'rspec-rails', '>= 3.8.3'
gem 'rspec-rails', '~> 6.0'
gem 'rubocop', require: false
gem 'rubocop-rails', '>= 2.19.0', require: false
gem 'rubocop-performance', '~> 1.17', require: false
Expand All @@ -38,18 +40,11 @@ group :development do
end

group :test do
gem 'axe-matchers', '~> 1.3.4'
gem 'bundler-audit', require: false
gem 'database_cleaner'
gem 'factory_bot_rails', '>= 5.2.0'
gem 'fakefs', require: 'fakefs/safe'
gem 'rails-controller-testing', '>= 1.0.4'
gem 'rspec_junit_formatter'
gem 'shoulda-matchers', '~> 3.1', '>= 3.1.3', require: false
gem 'simplecov', '>= 0.13.0'
gem 'timecop'
gem 'webmock'
gem 'zonebie'
end

gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Loading

0 comments on commit d30efe7

Please sign in to comment.