InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-10 18:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "cipd: ignore .cipd_client_root"

Browse Source 
This reverts commit 55f06f3e06.

Reason for revert: https://b.corp.google.com/issues/458283880#comment6.  Once and a while we discover a tool which uses the vendored depot tools. In this case, we weren't passing the user's depot tools path for debugging.  When that happens, the workspace will break, with no visible files in the change.  Instead, we'll reintroduce this, and add have the cipd root live in the out directory.  That will prevent the issue from the second bullet point.

Original change's description:
> 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>

Bug: 415080055
Change-Id: If3610a3660386f50a1567c2b7bae8437eb4860f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7138561
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Terrence Reilly <treilly@google.com>
This commit is contained in:
Terrence Reilly
2025-11-10 15:42:22 -08:00
committed by LUCI CQ
parent 67741248cf
commit ee1cf58691
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cipd
View File

@@ -94,6 +94,12 @@ 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}"

6
cipd_bin_setup.sh
View File

@@ -15,6 +15,12 @@ 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 \