Skip to content

Commit

Permalink
[omnibus] Fix build with custom branch of omnibus-software/ruby (#1589)
Browse files Browse the repository at this point in the history
We need to have the env vars in the env when `bundle install` is run,
otherwise the correct version won't be installed.
  • Loading branch information
olivielpeau committed Apr 13, 2018
1 parent 81a3980 commit c4a63cd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tasks/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,11 @@ def omnibus_build(ctx, puppy=False, log_level="info", base_dir=None, gem_path=No
overrides_cmd = "--override=" + " ".join(overrides)

with ctx.cd("omnibus"):
env = load_release_versions(ctx, release_version)
cmd = "bundle install"
if gem_path:
cmd += " --path {}".format(gem_path)
ctx.run(cmd)
ctx.run(cmd, env=env)

omnibus = "bundle exec omnibus.bat" if invoke.platform.WINDOWS else "bundle exec omnibus"
cmd = "{omnibus} build {project_name} --log-level={log_level} {overrides}"
Expand All @@ -241,7 +242,6 @@ def omnibus_build(ctx, puppy=False, log_level="info", base_dir=None, gem_path=No
"log_level": log_level,
"overrides": overrides_cmd
}
env = load_release_versions(ctx, release_version)
if skip_sign:
env['SKIP_SIGN_MAC'] = 'true'
ctx.run(cmd.format(**args), env=env)
Expand Down

0 comments on commit c4a63cd

Please sign in to comment.