Skip to content

Commit

Permalink
Merge branch 'master' into Raymond/APPEALS-24777
Browse files Browse the repository at this point in the history
  • Loading branch information
raymond-hughes authored Dec 30, 2023
2 parents 73a85b2 + 084cd98 commit b5529ae
Show file tree
Hide file tree
Showing 490 changed files with 22,286 additions and 6,831 deletions.
3 changes: 2 additions & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ plugins:
languages:
ruby:
javascript:
mass_threshold: 50
mass_threshold: 81
exclude_patterns:
- 'db/migrate/*'
- 'app/controllers/idt/api/v2/appeals_controller.rb'
Expand Down Expand Up @@ -122,3 +122,4 @@ exclude_patterns:
- 'tmp/**/*'
- 'app/assets/**/*'
- 'client/test/data/camoQueueConfigData.js'
- 'client/app/intake/components/mockData/issueListProps.js'
25 changes: 12 additions & 13 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
timeout-minutes: 45
services:
postgres:
image: postgres:11.7
image: postgres:14.8
env:
POSTGRES_USER: root
POSTGRES_PASSWORD: password
Expand Down Expand Up @@ -72,6 +72,7 @@ jobs:
KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
KNAPSACK_PRO_LOG_LEVEL: info
KNAPSACK_PRO_FIXED_QUEUE_SPLIT: true
WD_INSTALL_DIR: .webdrivers
CI: true
REDIS_URL_CACHE: redis://redis:6379/0/cache/
Expand Down Expand Up @@ -118,9 +119,8 @@ jobs:

- name: Install Chrome
run: |
CHROME_VERSION="106.0.5249.119-1"
apt-get update
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& apt install -y /tmp/chrome.deb \
&& rm /tmp/chrome.deb
echo "Chrome exe name: $(ls /usr/bin | chrome)"
Expand Down Expand Up @@ -267,11 +267,10 @@ jobs:
COVERAGE_DIR: /home/circleci/coverage #circleci is the USER

steps:
- name: Install chromium
- name: Install Chrome
run: |
CHROME_VERSION="106.0.5249.119-1"
apt-get update
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& apt install -y /tmp/chrome.deb \
&& rm /tmp/chrome.deb
- name: Checkout
Expand Down Expand Up @@ -331,16 +330,16 @@ jobs:
- name: Install Node Dependencies
run: ./ci-bin/capture-log "cd client && yarn install --frozen-lockfile"

- name: Danger
run: ./ci-bin/capture-log "bundle exec danger"
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
# - name: Danger
# run: ./ci-bin/capture-log "bundle exec danger"
# env:
# DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}

- name: Lint
run: ./ci-bin/capture-log "bundle exec rake lint"
if: ${{ always() }}

- name: Security
run: ./ci-bin/capture-log "bundle exec rake security"
if: ${{ always() }}
# - name: Security
# run: ./ci-bin/capture-log "bundle exec rake security"
# if: ${{ always() }}

1 change: 1 addition & 0 deletions .reek.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ detectors:
- Reporter#percent
- SanitizedJsonConfiguration
- ScheduleHearingTaskPager#sorted_tasks
- UpdatePOAConcern
- VBMSCaseflowLogger#log
- LegacyDocket
UnusedParameters:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem "browser"
gem "business_time", "~> 0.9.3"
gem "caseflow", git: "https://github.com/department-of-veterans-affairs/caseflow-commons", ref: "6377b46c2639248574673adc6a708d2568c6958c"
gem "connect_mpi", git: "https://github.com/department-of-veterans-affairs/connect-mpi.git", ref: "a3a58c64f85b980a8b5ea6347430dd73a99ea74c"
gem "connect_vbms", git: "https://github.com/department-of-veterans-affairs/connect_vbms.git", ref: "98b1f9f8aa368189a59af74d91cb0aa4c55006af"
gem "connect_vbms", git: "https://github.com/department-of-veterans-affairs/connect_vbms.git", ref: "9807d9c9f0f3e3494a60b6693dc4f455c1e3e922"
gem "console_tree_renderer", git: "https://github.com/department-of-veterans-affairs/console-tree-renderer.git", tag: "v0.1.1"
gem "countries"
gem "ddtrace"
Expand All @@ -38,7 +38,7 @@ gem "moment_timezone-rails"
gem "multiverse"
gem "newrelic_rpm"
gem "nokogiri", ">= 1.11.0.rc4"
gem "paper_trail", "~> 10"
gem "paper_trail", "~> 12.0"
# Used to speed up reporting
gem "parallel"
# soft delete gem
Expand All @@ -56,7 +56,7 @@ gem "pg", platforms: :ruby
# Discussion: https://github.com/18F/college-choice/issues/597#issuecomment-139034834
gem "puma", "5.6.4"
gem "rack", "~> 2.2.6.2"
gem "rails", "5.2.4.6"
gem "rails", "5.2.8.1"
# Used to colorize output for rake tasks
gem "rainbow"
# React
Expand Down
Loading

0 comments on commit b5529ae

Please sign in to comment.