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.

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

Leave BUNDLE_GEMFILE unset in workers if it was unset in the master #2154

Merged

Conversation

@cjlarose
Copy link
Contributor

cjlarose commented Mar 7, 2020

Description

Closes #2133

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.
@@ -298,7 +298,8 @@ def prune_bundler

log '* Pruning Bundler environment'
home = ENV['GEM_HOME']
bundle_gemfile = ENV['BUNDLE_GEMFILE']
bundle_gemfile = ENV['BUNDLER_ORIG_BUNDLE_GEMFILE']
bundle_gemfile = nil if bundle_gemfile == 'BUNDLER_ENVIRONMENT_PRESERVER_INTENTIONALLY_NIL'

This comment has been minimized.

Copy link
@nateberkopec

nateberkopec Mar 7, 2020

Member

What's this about?

This comment has been minimized.

Copy link
@cjlarose

cjlarose Mar 7, 2020

Author Contributor

Removed in d5e814e

@cjlarose cjlarose force-pushed the cjlarose:preserve-unspecified-bundle-gemfile branch from 0b47735 to d5e814e Mar 7, 2020
@seven1m
Copy link
Contributor

seven1m commented Mar 7, 2020

This is solid work. Love the test!

@nateberkopec
Copy link
Member

nateberkopec commented Mar 9, 2020

I'm gonna play around with the test locally but the code itself LGTM

@nateberkopec nateberkopec merged commit c87f088 into puma:master Mar 10, 2020
21 of 22 checks passed
21 of 22 checks passed
build
Details
ubuntu-18.04, 2.2
Details
ubuntu-18.04, 2.3
Details
ubuntu-18.04, 2.4
Details
ubuntu-18.04, 2.5
Details
ubuntu-18.04, 2.6
Details
ubuntu-18.04, 2.7
Details
ubuntu-18.04, ruby-head
Details
macos, 2.2
Details
macos, 2.3
Details
macos, 2.4
Details
macos, 2.5
Details
macos, 2.6
Details
macos, 2.7
Details
macos, ruby-head
Details
windows-latest, 2.3
Details
windows-latest, 2.4
Details
windows-latest, 2.5
Details
windows-latest, 2.6
Details
windows-latest, 2.7
Details
windows-latest, mingw
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.