Skip to content

Commit

Permalink
Merge pull request #1244 from mhashizume/maint/1.0.x/gem-source
Browse files Browse the repository at this point in the history
Export GEM_SOURCE to remote machine
  • Loading branch information
mhashizume authored Feb 23, 2024
2 parents 8794217 + e0f6807 commit 65433e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).
### Added
- (PA-6063) Added platform for Red Hat 9 FIPS for x86_64

### Changed
- Pass GEM_SOURCE environmental variable to remote hosts.

## [0.115.0] - 2024-02-13
### Changed
- (RE-13685) Reintroduce wrapper script, rather than inlined bash, to the 'createrepo' command
Expand Down
3 changes: 2 additions & 1 deletion lib/packaging/util/net.rb
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,8 @@ def remote_bundle_install_command
rvm_ruby_version = ENV['RVM_RUBY_VERSION'] || '3.1.1'
export_packaging_location = "export PACKAGING_LOCATION='#{ENV['PACKAGING_LOCATION']}';" if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty?
export_vanagon_location = "export VANAGON_LOCATION='#{ENV['VANAGON_LOCATION']}';" if ENV['VANAGON_LOCATION'] && !ENV['VANAGON_LOCATION'].empty?
"source /usr/local/rvm/scripts/rvm; rvm use ruby-#{rvm_ruby_version}; #{export_packaging_location} #{export_vanagon_location} bundle install --path .bundle/gems ;"
export_gem_source = "export GEM_SOURCE='#{ENV['GEM_SOURCE']}';" if ENV['GEM_SOURCE'] && !ENV['GEM_SOURCE'].empty?
"source /usr/local/rvm/scripts/rvm; rvm use ruby-#{rvm_ruby_version}; #{export_gem_source} #{export_packaging_location} #{export_vanagon_location} bundle install --path .bundle/gems ;"
end

# Given a BuildInstance object and a host, send its params to the host. Return
Expand Down

0 comments on commit 65433e0

Please sign in to comment.