diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2016-09-30 11:15:07 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-09-30 14:11:19 +0000 |
| commit | d59bcb6333be731d82c51c20211ecabebe194f19 (patch) | |
| tree | 490f480f61833cffad39127d24dac613a86bdec8 /scripts/packages/BUILD | |
| parent | 95a87d0d8b26d9ca7d8d957dc23373b6a89e3d68 (diff) | |
Rollback of commit c5545fd0896f3c602a9be0986debed6f0c9c662d.
*** Reason for rollback ***
Roll-forward with appropriate fixes: --action_env is a "build" option,
not a "common" option. Moreover, also inherit the corresponding variables
for tests from the effective action environment.
Also fix the corresponding error in the design document.
*** Original change description ***
Automated [] rollback of commit 96d46280bc5a4803ba2242a4ad16939f85a3b212.
*** Reason for rollback ***
Broke installation on latest release.
Fixes #1846
*** Original change description ***
Reintroduce .bazelrc and set --action_env defaults
Shipping a .bazelrc was removed in 009b48bcfaf4ebb17f9ab03bea9036cfa3c12ff0.
However, as per our "Specifying environment variables for actions" design
document, we want to ship a global rc file specifying the common environment
variables to be inherited. So revert that change and add the desired entries
to the global bazelrc file we're shipping.
***
--
MOS_MIGRATED_REVID=134769063
Diffstat (limited to 'scripts/packages/BUILD')
| -rw-r--r-- | scripts/packages/BUILD | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 44dc15a9fe..0e0221974d 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -93,6 +93,14 @@ pkg_tar( strip_prefix = ".", ) +pkg_tar( + name = "bazel-rc", + files = ["debian/bazel.bazelrc"], + mode = "0644", + package_dir = "/etc", + strip_prefix = "debian", +) + genrule( name = "rename-bazel-completion", srcs = ["//scripts:bash_completion"], @@ -113,6 +121,7 @@ pkg_tar( deps = [ ":bazel-bin", ":bazel-completion", + ":bazel-rc", ], ) |