From f48639f3fe727ffd7b3fa187cb586418030c4817 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Thu, 2 Mar 2023 14:56:29 -0800 Subject: [PATCH] Automatically register tools/ on PATH Developers with `direnv` installed will have ./tools added to their PATH automatically. Also adds it to the PATH in the dev container. This reduces `tools/dev_container tools/presubmit` to `dev_container presubmit`. Note: Does not rebuild the container, the change can be picked up at a later time. BUG=None TEST=cd crosvm Change-Id: Ia57bd7bb1cf86df2b32d624d97a74518e8b5f423 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4305345 Reviewed-by: Daniel Verkamp Commit-Queue: Dennis Kempin --- .envrc | 1 + .gitignore | 1 - tools/impl/dev_container/Dockerfile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 000000000..9409d7ccb --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +PATH_add tools diff --git a/.gitignore b/.gitignore index 59d7832f9..6d002d5a7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ target/ **/*.pyc lcov.info .idea -.envrc .vscode/* !.vscode/settings.json diff --git a/tools/impl/dev_container/Dockerfile b/tools/impl/dev_container/Dockerfile index 2a052bb29..914f448a2 100644 --- a/tools/impl/dev_container/Dockerfile +++ b/tools/impl/dev_container/Dockerfile @@ -20,7 +20,7 @@ FROM docker.io/debian:testing-slim ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH + PATH=/workspace/tools:/usr/local/cargo/bin:$PATH # Install pipx applications globally in /usr/local/bin ENV PIPX_HOME=/usr/local/pipx \