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.

Sign up for GitHub

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

Jump to bottom

[omnibus] Fix MacOS build conflicting with system Python 3 #5010

Merged
merged 2 commits into from
Feb 27, 2020
Merged

[omnibus] Fix MacOS build conflicting with system Python 3 #5010

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a26cb
Fix MacOS build conflicting with system Python 3
KSerrania Feb 27, 2020
7c78b57
Link to PR for full explanation
KSerrania Feb 27, 2020
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
9 changes: 8 additions & 1 deletion tasks/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,14 @@ def omnibus_build(ctx, puppy=False, agent_binaries=False, log_level="info", base
elif agent_binaries:
target_project = "agent-binaries"

omnibus = "bundle exec omnibus.bat" if sys.platform == 'win32' else "bundle exec omnibus"
omnibus = "bundle exec omnibus"
if sys.platform == 'win32':
omnibus = "bundle exec omnibus.bat"
elif sys.platform == 'darwin':
# HACK: This is an ugly hack to fix another hack made by python3 on MacOS
# The full explanation is available on this PR: https://github.com/DataDog/datadog-agent/pull/5010.
omnibus = "unset __PYVENV_LAUNCHER__ && bundle exec omnibus"

cmd = "{omnibus} build {project_name} --log-level={log_level} {populate_s3_cache} {overrides}"
args = {
"omnibus": omnibus,
Expand Down