Commit Graph

13 Commits (main)

Author SHA1 Message Date
Yiwei Zhang 1790a4b687 provide a way to override cipd root for *nix systems.
So that it allows depot tools has the ability to write the cipd pkgs
outside of the repo.

windows support will be added in a follow-up change.

Bug: 355430412
Change-Id: I7fabed7ecac8216ba3f3f639217d9e36746241f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5742434
Reviewed-by: Gregory Guterman <guterman@google.com>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
7 months ago
Mike Frysinger 397276fe81 cipd_bin_setup: load cipd script instead of running it
Run it in a subshell to avoid forking+execing another shell.

Bug: 1469696
Change-Id: I173f18aa3bf2f181db261750f4e51422717886ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4753234
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
2 years ago
Mike Frysinger b9b690ec0e setup & share current uname -s value
Avoid recomputing this value multiple times between vpython & cipd.

Bug: 1469696
Change-Id: If82d58180f94cb2833a5a177f7b1e431e08f2892
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4750040
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
2 years ago
Mike Frysinger 248aa8ba81 setup & share path to depot_tools checkout
A lot of scripts like to compute the dirname of $0 to find itself to
load more files.  Have some scripts export & resuse this value so we
avoid recalculating when not needed.

Bug: 1469696
Change-Id: I3aac2e6119dbfa3c68715208df2786f67cdce92e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4750430
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
2 years ago
Fumitoshi Ukai a0aed87f71 Revert "put goma client in depot_tools"
This reverts commit 7778035801.

Reason for revert: AttributeError: 'GomaEnvPosix' object has no attribute 'RestartCompilerProxy'

Original change's description:
> put goma client in depot_tools
> 
> install goma client cipd package in depot_tools.
> 
> should not use $MYPATH/goma_ctl in cipd_bin_setup
> since $MYPATH/goma_ctl uses cipd_bin_setup in itself,
> so causing recursive calls.
> invoke python to run .cipd/goma_ctl.py in cipd_bin_setup
> instead.
> 
> Bug: b/77663154
> Change-Id: I9f82c766a886a2acfb899e3594e5f05a7b7bc75a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1866350
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>

TBR=sque@chromium.org,ukai@chromium.org,yyanagisawa@google.com,vadimsh@chromium.org,dpranke@chromium.org,tikuta@chromium.org,ehmaldonado@chromium.org,yekuang@google.com

Change-Id: Ie050dfb524dd885634c31be829d733613e80aece
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/77663154
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1872129
Reviewed-by: Fumitoshi Ukai <ukai@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
5 years ago
Fumitoshi Ukai 7778035801 put goma client in depot_tools
install goma client cipd package in depot_tools.

should not use $MYPATH/goma_ctl in cipd_bin_setup
since $MYPATH/goma_ctl uses cipd_bin_setup in itself,
so causing recursive calls.
invoke python to run .cipd/goma_ctl.py in cipd_bin_setup
instead.

Bug: b/77663154
Change-Id: I9f82c766a886a2acfb899e3594e5f05a7b7bc75a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1866350
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
5 years ago
Fumitoshi Ukai 8076771cb1 Revert "put goma client in depot_tools"
This reverts commit 6e48505301.

Reason for revert: cause recursive calls of update_hook

  |   \_ bash /usr/local/google/home/ukai/depot_tools/gclient sync
ukai      29514  0.0  0.0  16104  3648 pts/10   S+   14:40   0:00  |
   |       \_ bash /usr/local/google/home/ukai/depot_tools/update_depot_tools sync
ukai      29586  0.0  0.0  15972  3276 pts/10   S+   14:40   0:00  |
   |           \_ bash /usr/local/google/home/ukai/depot_tools/goma_ctl update_hook
ukai      29614  0.0  0.0  15972  3192 pts/10   S+   14:40   0:00  |
   |               \_ bash /usr/local/google/home/ukai/depot_tools/goma_ctl update_hook

Original change's description:
> put goma client in depot_tools
> 
> install goma client cipd package in depot_tools.
> 
> Bug: b/77663154
> Change-Id: Ibcfc42b9b7705bcf71b4ba2e834b4ebf09ad25fe
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1846892
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>

TBR=sque@chromium.org,ukai@chromium.org,yyanagisawa@google.com,tikuta@chromium.org,ehmaldonado@chromium.org,apolito@google.com

Change-Id: I644799c06f74a436b201c4c6c3de44af30c51556
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/77663154
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1866349
Reviewed-by: Fumitoshi Ukai <ukai@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
5 years ago
Fumitoshi Ukai 6e48505301 put goma client in depot_tools
install goma client cipd package in depot_tools.

Bug: b/77663154
Change-Id: Ibcfc42b9b7705bcf71b4ba2e834b4ebf09ad25fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1846892
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
5 years ago
Chris Nardi ab816ce8ff Fix depot_tools errors that cause runhooks to be inoperable for Cygwin
The vpython/CIPD work created some errors when attempting to build on
Cygwin. This patch fixes these errors by converting Cygwin paths to
Windows paths or using the depot_tools python instead of Cygwin python.

Bug:
Change-Id: Id62f59a357fa2937c7eb843bf306ef4303b0910e
Reviewed-on: https://chromium-review.googlesource.com/745727
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
7 years ago
Dan Jacques eb1feb9090 [cipd] Bump version, log at warning (#2).
Bump the CIPD client version to
b482bfa19d3fa79b4b40dd5ac7a34479052e3df1. This version inculdes support
for the "-log-level" flag.

Update CIPD bootstrap scripts and tool installation scripts to log at
warning level, so that standard operation doesn't produce any logs.

This version differs from the previous CL in that the "selfupdate"
command no longer uses "-log-level". This fixes an issue where the
current CIPD, which doesn't support "-log-level", is given the flag
prior to actually updating to a version that does.

BUG=chromium:748651
TEST=canary
  - Tested this CIPD version on canary waterfall successfully.

Change-Id: I69dfe522d890eb307214f18d0467ce921a766446
Reviewed-on: https://chromium-review.googlesource.com/589568
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Daniel Jacques 9f9d82ac94 Revert "[cipd] Bump version, log at warning."
This reverts commit 18aa2d93ed.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> [cipd] Bump version, log at warning.
> 
> Bump the CIPD client version to
> e2a98b41adb3403b5b7771c4101b42a55dc2dd9e. This version inculdes support
> for the "-log-level" flag.
> 
> Update CIPD bootstrap scripts and tool installation scripts to log at
> warning level, so that standard operation doesn't produce any logs.
> 
> BUG=chromium:748651
> TEST=canary
>   - Tested this CIPD version on canary waterfall successfully.
>   - Tested "gclient" bootstrap and "vpython" / "led" on Windows system,
>     no output and works.
>   - Tested "vpython" / "led" on OSX system, no output and works.
> 
> Change-Id: Iae316908283c43c504f293aafdf897df83dccf8d
> Reviewed-on: https://chromium-review.googlesource.com/588889
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Daniel Jacques <dnj@chromium.org>

TBR=iannucci@chromium.org,dnj@chromium.org

Change-Id: Ia611c1aeb204c609ff3469076b8256c54e702230
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:748651
Reviewed-on: https://chromium-review.googlesource.com/589527
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
8 years ago
Dan Jacques 18aa2d93ed [cipd] Bump version, log at warning.
Bump the CIPD client version to
e2a98b41adb3403b5b7771c4101b42a55dc2dd9e. This version inculdes support
for the "-log-level" flag.

Update CIPD bootstrap scripts and tool installation scripts to log at
warning level, so that standard operation doesn't produce any logs.

BUG=chromium:748651
TEST=canary
  - Tested this CIPD version on canary waterfall successfully.
  - Tested "gclient" bootstrap and "vpython" / "led" on Windows system,
    no output and works.
  - Tested "vpython" / "led" on OSX system, no output and works.

Change-Id: Iae316908283c43c504f293aafdf897df83dccf8d
Reviewed-on: https://chromium-review.googlesource.com/588889
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
8 years ago
Sergey Berezin 6fee2673e9 Add vpython to depot_tools for linux and mac
BUG=717208
R=dnj@chromium.org

Change-Id: If937a382be9aa4d8eb5f957386e8b1b28cc1c3ac
Reviewed-on: https://chromium-review.googlesource.com/492086
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Sergey Berezin <sergeyberezin@chromium.org>
8 years ago