cipd: ignore .cipd_client_root

It was introduced to override the cipd bin path so that the downloaded
files wouldn't be listed in the CiderG workspace file tree when
the bundled depot_tools is used.

However,
- chromium no longer uses the bundled depot_tools
- the cipd_client_root, pointing to a folder in /tmp, causes issues
when a temp cleanup cron removes files based on the last access ts.

We no longer need .cipd_client_root.

Bug: 415080055
Change-Id: Ic966699cce3173a8ce4033752edec5e53aded870
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6614519
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Scott Lee <ddoman@chromium.org>
This commit is contained in:
Scott Lee
2025-06-02 17:38:10 -07:00
committed by LUCI CQ
parent 39e269dabf
commit 55f06f3e06
2 changed files with 0 additions and 12 deletions

6
cipd
View File

@@ -91,12 +91,6 @@ CIPD_BACKEND="https://chrome-infra-packages.appspot.com"
VERSION_FILE="${DEPOT_TOOLS_DIR}/cipd_client_version"
CIPD_ROOT="${DEPOT_TOOLS_DIR}"
# value in .cipd_client_root file overrides the default root.
CIPD_ROOT_OVERRIDE_FILE="${DEPOT_TOOLS_DIR}/.cipd_client_root"
if [ -f "${CIPD_ROOT_OVERRIDE_FILE}" ]; then
CIPD_ROOT=$(<"${CIPD_ROOT_OVERRIDE_FILE}")
mkdir -p "${CIPD_ROOT}"
fi
CLIENT="${CIPD_ROOT}/.cipd_client"
PLATFORM="${OS}-${ARCH}"

View File

@@ -15,12 +15,6 @@ function cipd_bin_setup {
;;
esac
# value in .cipd_client_root file overrides the default root.
CIPD_ROOT_OVERRIDE_FILE="${MYPATH}/.cipd_client_root"
if [ -f "${CIPD_ROOT_OVERRIDE_FILE}" ]; then
ROOT=$(<"${CIPD_ROOT_OVERRIDE_FILE}")
fi
(
source "$MYPATH/cipd" ensure \
-log-level warning \