Skip to content

Commit

Permalink
Bump pg to 1.4.6 (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
bshand authored Jun 13, 2024
1 parent 2e492af commit 0490cf3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 9 deletions.
8 changes: 2 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ gem 'rails', '~> 6.1.0', '>= 6.1.7.5'
gem 'psych', '3.3.2' # Exactly match the version on Ruby 3.0

# Use postgresql as the database for Active Record
if /\A3[.][01][.]/.match?(RUBY_VERSION)
gem 'pg', '~> 1.2.3' # Support old CentOS 7 PostgreSQL client 9.2.24 for as long as possible
else
gem 'pg' # Drop CentOS 7 support for ruby 3.2
end
gem 'pg', '~> 1.4.6' # All client instance have postgres version >= 9.3

# use Puma as the app server
gem 'puma', '~> 6.0'
Expand Down Expand Up @@ -95,8 +91,8 @@ gem 'ndr_support', '~> 5.9'
gem 'ndr_ui'
gem 'ndr_workflow', '~> 1.2', '>= 1.2.2'

gem 'caxlsx', '~> 4'
gem 'bootstrap-table-rails', '~> 1.20.2'
gem 'caxlsx', '~> 4'

gem 'loofah', '>= 2.3.1' # address CVE-2019-15587
gem 'nokogiri', '~> 1.11'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (1.2.3)
pg (1.4.6)
possibly (1.0.1)
power_assert (2.0.3)
prometheus-client (4.0.0)
Expand Down Expand Up @@ -578,7 +578,7 @@ DEPENDENCIES
paper_trail (~> 12.0)
paper_trail-association_tracking
parser
pg (~> 1.2.3)
pg (~> 1.4.6)
possibly
pry
pry-rails
Expand Down
13 changes: 12 additions & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,19 @@
task :configure do
# We need to use local configuration, because global configuration will be "global" for the
# deploying user, rather than the application user.
# You can override the path using e.g. set :pg_conf_path, '/usr/pgsql-9.5/bin/pg_config'
# otherwise the latest installed version will be used.
run <<~SHELL
cd #{release_path} && bundle config --local build.pg --with-pg-config=/usr/pgsql-9.5/bin/pg_config
set -e;
cd #{release_path};
pg_conf_path="#{fetch(:pg_conf_path, '')}";
if [ -z "$pg_conf_path" ]; then
pg_conf_path=`ls -1d /usr/pgsql-{9,[1-8]*}/bin/pg_config 2> /dev/null | tail -1`;
fi;
if [ -n "$pg_conf_path" ]; then
echo Using pg_conf_path=\"$pg_conf_path\";
bundle config --local build.pg --with-pg-config="$pg_conf_path";
fi
SHELL
end
end
Expand Down
Binary file removed vendor/cache/pg-1.2.3.gem
Binary file not shown.
Binary file added vendor/cache/pg-1.4.6.gem
Binary file not shown.

0 comments on commit 0490cf3

Please sign in to comment.