Commit Graph

10 Commits (main)

Author SHA1 Message Date
Yngve Pettersen f7b9e70a2e Use relative path for cipd
Using $base_dir/cipd as a path for the cipd command only works when
$base_dir is an absolute path, not when it is a relative path, as
the current directory is already $base_dir.

Therefore, "./cipd" must be used to run a command located in $base_dir.

Change-Id: Ia882a7fb404b7ff837944f80c0ace3f4e90e6a97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4479169
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Yngve Pettersen <yngve@vivaldi.com>
2 years ago
Brian Norris a1b3db589f bootstrap_python3: Find 'cipd' in base_dir, not PATH
There might be multiple copies of depot_tools involved, and it might not
even be on PATH.

This matches the pattern of various other setup/bootstrap scripts (e.g.,
cipd_bin_setup.sh).

BUG=none
TEST=`.../ensure_bootstrap` without being on PATH

Change-Id: Ic9135298629726e69619d259af110684d017d0f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4377789
Commit-Queue: Brian Norris <briannorris@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
2 years ago
Nico Weber 3a56ba9d9c [mac/arm] pull python3 binary in cipd bootstrap now that it exists
With this, it's possible to run some things without

  export VPYTHON_BYPASS="manually managed python not supported by chrome operations"

on an arm mac, such as `git cl upload` -- this CL was uploaded
from my M1 MBP :)

(Presubmits need py2 which we don't have yet, but with
`--bypass-hooks` it works.)

Bug: 1103326,1184767,1103236
Change-Id: I46f5b880dfd72b8d811d39b43311fdee17ccad3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2858534
Commit-Queue: Dirk Pranke <dpranke@google.com>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
4 years ago
Nico Weber 6900c00a1a depot_tools bootstrap: Don't try to pull non-existent binaries on mac/arm64
With this, `gclient` completes bootstrap after running

    echo "mac-arm64" > .cipd_client_platform

as long as you also run

    export VPYTHON_BYPASS="manually managed python not supported by chrome operations"

Things work enough that you can `fetch chromium`. You can then build
all of chrome (if you want to build all tests, you also need to
`echo "mac-arm64" > third_party/depot_tools/.cipd_client_platform`
in your chromium checkout).

Parts of depot_tools that actually need the env managed by vpython,
such as `git cl`, don't work. So you can't `git cl upload` for now.

Bug: 1184768,1103326,1184766,1184765,1103236
Change-Id: Ib559c35e9665b826db9841dd8a4fe0dea16f37ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2807956
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
4 years ago
John Stiles 11f4a84bb1 Add quotes around paths in bash scripts.
This allows git-cl to run successfully when the depot tools are installed to a path with a space in it.

Change-Id: I79fa44d13f89fb0ee1baaa90961b4c4284913c40
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2125626
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Edward Lemur 24995256ee Reland "depot_tools: Bootstrap Python 3 on Linux/Mac"
Don't call ensure_bootstrap from update_depot_tools.
ensure_bootstrap also updates gsutil and all versions of pylint
which is slow, particularly on MinGW.

Original change's description:
> depot_tools: Bootstrap Python 3 on Linux/Mac
>
> This will make it possible for developers to execute depot_tools
> scripts using Python 3 in a known environment.
>
> Bug: 1002153
> Change-Id: I5ff492a49d227c1b5876f49adba020f51a575bdd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1762664
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@google.com>

Bug: 1002153
Change-Id: Ia7579e440438897ba4a7c65a8b228dcfe7f28c86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1810040
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Edward Lemur f73f0f401a Revert "Reland "depot_tools: Bootstrap Python 3 on Linux/Mac""
This reverts commits 0e85f633c7 and 9d25ad4192.

Reason for revert:

Causes problems for MinGW users.

Original change's description:
> Reland "depot_tools: Bootstrap Python 3 on Linux/Mac"
>
> This is a reland of dbca865e55
>
> Original change's description:
> > depot_tools: Bootstrap Python 3 on Linux/Mac
> >
> > This will make it possible for developers to execute depot_tools
> > scripts using Python 3 in a known environment.
> >
> > Bug: 1002153
> > Change-Id: I5ff492a49d227c1b5876f49adba020f51a575bdd
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1762664
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> > Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
>
> Bug: 1002153
> Change-Id: I6938a76ffa05366c21f7c56aed3d07ecb2b84443
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1798845
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=iannucci@chromium.org,dpranke@chromium.org,tandrii@google.com,ehmaldonado@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1002153
Change-Id: I3ee87b95b2532ec694d7f4f87cce8cde8ccf86eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1808137
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Edward Lemur 0e85f633c7 Reland "depot_tools: Bootstrap Python 3 on Linux/Mac"
This is a reland of dbca865e55

Original change's description:
> depot_tools: Bootstrap Python 3 on Linux/Mac
> 
> This will make it possible for developers to execute depot_tools
> scripts using Python 3 in a known environment.
> 
> Bug: 1002153
> Change-Id: I5ff492a49d227c1b5876f49adba020f51a575bdd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1762664
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@google.com>

Bug: 1002153
Change-Id: I6938a76ffa05366c21f7c56aed3d07ecb2b84443
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1798845
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Edward Lesmes cc6f585f05 Revert "depot_tools: Bootstrap Python 3 on Linux/Mac"
This reverts commit dbca865e55.

Reason for revert:

Fails on Mac

$ gclient sync --with_branch_heads
awk: syntax error at source line 1
 context is
	match($0, >>>  /cpython3\/.*version:([.0-9a-zA-Z]+)/, <<<
awk: bailing out at source line 1
Could not extract Python 3 version from manifest.


Original change's description:
> depot_tools: Bootstrap Python 3 on Linux/Mac
> 
> This will make it possible for developers to execute depot_tools
> scripts using Python 3 in a known environment.
> 
> Bug: 1002153
> Change-Id: I5ff492a49d227c1b5876f49adba020f51a575bdd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1762664
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@google.com>

TBR=iannucci@chromium.org,dpranke@chromium.org,tandrii@google.com,ehmaldonado@chromium.org

Change-Id: I8e03a9e22655491d0f8e8d214d04ba749c2ab8ab
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1002153
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1797197
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Edward Lemur dbca865e55 depot_tools: Bootstrap Python 3 on Linux/Mac
This will make it possible for developers to execute depot_tools
scripts using Python 3 in a known environment.

Bug: 1002153
Change-Id: I5ff492a49d227c1b5876f49adba020f51a575bdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1762664
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
6 years ago