Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

APPEALS-54874: Update PG and Ruby-oci8 gems #23125

Merged
merged 8 commits into from
Oct 8, 2024
Merged

APPEALS-54874: Update PG and Ruby-oci8 gems #23125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a6a28e
update minimum version in gemfile and ran bundle install (#22503)
craigrva Aug 15, 2024
6e7c7aa
Merge branch 'master' into dev-support/APPEALS-54874
craigrva Aug 23, 2024
608ac5e
require ruby-oci8 in config/boot.rb to fix SIGV fault
craigrva Aug 26, 2024
701ed4a
Merge branch 'master' of https://github.com/department-of-veterans-af…
craigrva Sep 16, 2024
7f576a5
Merge branch 'master' into dev-support/APPEALS-54874
craigrva Sep 19, 2024
88e8dd2
Merge branch 'main' of https://github.com/department-of-veterans-affa…
craigrva Oct 1, 2024
f06936c
Merge branch 'release/FY24Q4.6.2' into dev-support/APPEALS-54874-3
craigrva Oct 8, 2024
2c654a5
Merge branch 'release/FY24Q4.6.2' into dev-support/APPEALS-54874-3
craigrva Oct 8, 2024
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
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ gem "pdfjs_viewer-rails", git: "https://github.com/senny/pdfjs_viewer-rails.git"
# Used to build out PDF files on the backend
# https://github.com/pdfkit/pdfkit
gem "pdfkit"
gem "pg", platforms: :ruby
gem "pg", "~> 1.5.7", platforms: :ruby
# Application server: Puma
# Puma was chosen because it handles load of 40+ concurrent users better than Unicorn and Passenger
# Discussion: https://github.com/18F/college-choice/issues/597#issuecomment-139034834
Expand Down Expand Up @@ -104,7 +104,7 @@ gem "ziptz"
group :production, :staging, :ssh_forwarding, :development, :test do
# Oracle DB
gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
gem "ruby-oci8", "~> 2.2"
gem "ruby-oci8", "~> 2.2.14"
end

group :test, :development, :demo, :make_docs do
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,7 +1839,7 @@ GEM
cliver (~> 0.3.2)
safe_shell (>= 1.0.3, < 2.0)
pdfkit (0.8.7.2)
pg (1.1.4)
pg (1.5.7)
pluck_to_hash (1.0.2)
activerecord (>= 4.0.2)
activesupport (>= 4.0.2)
Expand Down Expand Up @@ -1990,7 +1990,7 @@ GEM
ruby-debug-ide (0.7.3)
rake (>= 0.8.1)
ruby-graphviz (1.2.4)
ruby-oci8 (2.2.7)
ruby-oci8 (2.2.14)
ruby-plsql (0.8.0)
ruby-prof (1.4.1)
ruby-progressbar (1.13.0)
Expand Down Expand Up @@ -2201,7 +2201,7 @@ DEPENDENCIES
pdf-forms
pdfjs_viewer-rails!
pdfkit
pg
pg (~> 1.5.7)
pluck_to_hash
pry (~> 0.13.0)
pry-byebug (~> 3.9)
Expand Down Expand Up @@ -2229,7 +2229,7 @@ DEPENDENCIES
rubocop-performance
rubocop-rails
ruby-debug-ide
ruby-oci8 (~> 2.2)
ruby-oci8 (~> 2.2.14)
ruby-prof (~> 1.4)
ruby_claim_evidence_api!
sass-rails (~> 5.0)
Expand Down
8 changes: 6 additions & 2 deletions config/boot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
ENV["NLS_LANG"] = "AMERICAN_AMERICA.UTF8"

require "bundler/setup" # Set up gems listed in the Gemfile.
require "bootsnap/setup" # Speed up boot time by caching expensive operations.
require 'bundler/setup' # Set up gems listed in the Gemfile.
require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

# Pull this in before any other non-bundler/bootsnap gem to avoid SIGSEGV
# during Oracle connection setup on arm64 architecture.
require 'ruby-oci8'
Loading