Skip to content
Merged
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
188 changes: 0 additions & 188 deletions .circleci/config.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .codeclimate.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
variables:
ECR_REGISTRY: '${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com'
IDP_WORKER_IMAGE_TAG: 'main'
PIVCAC_CI_SHA: 'sha256:87767eb8daa6703c247d5a4baa5e19eddc58bc051f01070903f24d9f8a6c9267'
PIVCAC_CI_SHA: 'sha256:41c2b811ee61aa06c662e2d631812cda04d06a0dd15e177ec04997dcaeb1cc9c'
CI: 'true'

default:
image: '${ECR_REGISTRY}/pivcac/ci@${PIVCAC_CI_SHA}'
Expand Down Expand Up @@ -339,9 +340,10 @@ ecr-scan:
- >
while true; do
SCAN_STATUS=$(aws ecr describe-image-scan-findings --repository-name identity-pivcac/review --image-id imageTag=$CI_COMMIT_SHA --query 'imageScanStatus.status' --output text || true)
if [ "$SCAN_STATUS" == "ACTIVE" ]; then
if echo "$SCAN_STATUS" | grep -q "ACTIVE"; then
echo "Scan Complete"
break
elif [ "$SCAN_STATUS" == "FAILED" ]; then
elif echo "$SCAN_STATUS" | grep -q "FAILED"; then
echo "ECR scan failed"
exit 1
else
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
3.2
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
source 'https://rubygems.org'
git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

ruby '~> 3.0'
ruby '~> 3.2'

gem 'rails', '~> 6.1.6'
gem 'rails', '~> 7.0.7'

gem 'activerecord-import', '>= 1.0.2'
gem 'aws-sdk-s3'
gem 'bloomfilter-rb'
gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v3.4.1'
gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v3.4.2'
gem 'identity-logging', github: '18F/identity-logging', tag: 'v0.1.0'
gem 'mini_cache'
gem 'newrelic_rpm'
gem 'newrelic_rpm', '~> 8.0'
gem 'pg'
gem 'pry-rails'
gem 'puma'
gem 'redacted_struct', '~> 1.0'
gem 'rgl'

group :development, :test do
gem 'bullet', '>= 6.0.2'
gem 'bullet', '~> 7.0'
gem 'brakeman', require: false
gem 'pry-byebug'
gem 'rspec-rails', '>= 3.8.3'
gem 'rubocop', require: false
Expand All @@ -29,7 +30,6 @@ end

group :development do
gem 'better_errors', '>= 2.5.1'
gem 'brakeman', require: false
gem 'bummr', require: false
gem 'guard-rspec', require: false
gem 'overcommit', require: false
Expand All @@ -39,6 +39,7 @@ 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'
Expand Down
Loading