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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ GEM
mocha (2.7.1)
ruby2_keywords (>= 0.0.5)
msgpack (1.8.0)
ndr_dev_support (7.3.3)
ndr_dev_support (7.3.4)
activesupport (>= 6.1, < 8.1)
brakeman (>= 4.7.1)
bundler-audit
Expand Down
17 changes: 16 additions & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Avoid spurious deprecation warning on STDERR with capistrano 2 and bundler 2.x
set :bundle_cmd, 'BUNDLE_SILENCE_DEPRECATIONS=true bundle'

require 'bundler/capistrano'
require 'ndr_dev_support/capistrano/ndr_model'

Expand Down Expand Up @@ -51,8 +54,20 @@
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.
# Note that the relevant postgresql-devel package is required, not just postgresql
run <<~SHELL
cd #{release_path} && bundle config --local build.pg --with-pg-config=/usr/pgsql-11/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]*}/include 2> /dev/null | sed -e 's:/include$:/bin/pg_config:' | 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/ndr_dev_support-7.3.3.gem
Binary file not shown.
Binary file added vendor/cache/ndr_dev_support-7.3.4.gem
Binary file not shown.