Commit Graph

12 Commits (209a681f9cb0e955d5659216f262ef5b00861e8a)

Author SHA1 Message Date
Andrii Shyshkalov af5c20f5a4 Revert "[win_tools] Use bundled Python CIPD packages."
This reverts commit bf1446791e.

Reason for revert: broke win bots http://o/410053

Original change's description:
> [win_tools] Use bundled Python CIPD packages.
> 
> Enable bundled Python CIPD packages in bleeding-edge mode. This
> replaces the ZIP unpacking approach used before, and introduces
> validation and management through the CIPD tool. The bleeding edge
> version will only install if a sentinel file is present in the
> "depot_tools" root; otherwise, default behavior will continue.
> 
> This method adds a upgrade and downgrade path to/from ZIP and
> CIPD installations. This is done by rewriting the "win_tools.bat"
> process:
> 
> 1) Ensure that a bootstrap Python is present.
> 2) Use it to run "win_tools.py", which has the functionality of
>     "git_bootstrap.py" plus Python installation.
> 3) Run "win_tools.py" with appropriate flags.
> 
> Some tricks were employed to handle cases where there is an
> already-running Python instance that uses the current Python
> installation and executable. This happens on bots because the
> system uses the same "depot_tools" checkout at multiple launch
> layers. To this end, we use the "python.bat" as the "current Python"
> authority and refrain from cleaning up old Python directories if their
> "python.exe" binaries are currently in use.
> 
> We change the Git bleeding edge file to share the same
> sentinel file as Python, ".bleeding_edge".
> 
> The new Python should have the same facilities as the original Python
> bundle.
> 
> BUG=chromium:740171
> TEST=local
> 
> Change-Id: I1b3b7d31d47d1a37a9dba9114d31681bec558736
> Reviewed-on: https://chromium-review.googlesource.com/563036
> Commit-Queue: Daniel Jacques <dnj@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

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

Change-Id: I84574a01bbad6596912e4aaa34f019d24720b638
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:740171
Reviewed-on: https://chromium-review.googlesource.com/567009
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
8 years ago
Dan Jacques bf1446791e [win_tools] Use bundled Python CIPD packages.
Enable bundled Python CIPD packages in bleeding-edge mode. This
replaces the ZIP unpacking approach used before, and introduces
validation and management through the CIPD tool. The bleeding edge
version will only install if a sentinel file is present in the
"depot_tools" root; otherwise, default behavior will continue.

This method adds a upgrade and downgrade path to/from ZIP and
CIPD installations. This is done by rewriting the "win_tools.bat"
process:

1) Ensure that a bootstrap Python is present.
2) Use it to run "win_tools.py", which has the functionality of
    "git_bootstrap.py" plus Python installation.
3) Run "win_tools.py" with appropriate flags.

Some tricks were employed to handle cases where there is an
already-running Python instance that uses the current Python
installation and executable. This happens on bots because the
system uses the same "depot_tools" checkout at multiple launch
layers. To this end, we use the "python.bat" as the "current Python"
authority and refrain from cleaning up old Python directories if their
"python.exe" binaries are currently in use.

We change the Git bleeding edge file to share the same
sentinel file as Python, ".bleeding_edge".

The new Python should have the same facilities as the original Python
bundle.

BUG=chromium:740171
TEST=local

Change-Id: I1b3b7d31d47d1a37a9dba9114d31681bec558736
Reviewed-on: https://chromium-review.googlesource.com/563036
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dan Jacques 79e897b017 [git_bootstrap] Support new Git bundles.
Support new fully-bundled Git CIPD packages. These are generated by the
"third_party_packages" infra builder, and require no installer.

BUG=chromium:740171
TEST=local

Change-Id: I6126655359ba981eb18ad1e088fe787100719d46
Reviewed-on: https://chromium-review.googlesource.com/562531
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Robbie Iannucci 362bc168c4 Revert "[git_bootstrap.py] Remove unused options, use cipd in %PATH%."
This reverts commit 1123fea235.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> [git_bootstrap.py] Remove unused options, use cipd in %PATH%.
> 
> In particular:
>   * Rely on cipd.bat in %PATH%
>   * Always calculate --bits
>   * Rely on %CIPD_CACHE_DIR%
> 
> R=​vadimsh@chromium.org
> 
> Bug: 635421
> Change-Id: I972edfd7f48e90770696afba70ec7e11fc24ce95
> Reviewed-on: https://chromium-review.googlesource.com/495407
> Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
> Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
> 

TBR=iannucci@chromium.org,vadimsh@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I3536d6668432141ae1528ca49ea66d97fdeb5318
Reviewed-on: https://chromium-review.googlesource.com/495727
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Robert Iannucci 1123fea235 [git_bootstrap.py] Remove unused options, use cipd in %PATH%.
In particular:
  * Rely on cipd.bat in %PATH%
  * Always calculate --bits
  * Rely on %CIPD_CACHE_DIR%

R=vadimsh@chromium.org

Bug: 635421
Change-Id: I972edfd7f48e90770696afba70ec7e11fc24ce95
Reviewed-on: https://chromium-review.googlesource.com/495407
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
8 years ago
anatoly techtonik a5bec84569 [bootstrap] Move bitness detection logic into Python
Bug: 703064

Change-Id: I319e89a43533b86c0eedff56fec2665fa13e728c
Reviewed-on: https://chromium-review.googlesource.com/466006
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
anatoly techtonik bf3dd5a8db Fix "git help <command>" on 32-bit Windows
xcopy flags replaced - /i dest is directory, /q quiet, /d newer, /y yes

Bug: 707150
Change-Id: I3fe47dae78bd7153aa66dbf207f8d8c73eb4dc83
Reviewed-on: https://chromium-review.googlesource.com/464866
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: anatoly techtonik <techtonik@gmail.com>
8 years ago
Robbie Iannucci 229ac2bb53 Revert "Revert "Stop adhoc cipd client bootstrap.""
This reverts commit 70f351e784.

Reason for revert: CIPD bootstrap is now PS 2.0 compatible.

BUG=674363,673940

Original change's description:
> Revert "Stop adhoc cipd client bootstrap."
> 
> This reverts commit c6569aab12.
> 
> Reason for revert: This caused crbug.com/674363, needs further investigation.
> 
> Original change's description:
> > Stop adhoc cipd client bootstrap.
> > 
> > This was used before to get the git installer, but now depot_tools manages its
> > own copy of CIPD.
> > 
> > BUG=673940
> > 
> > Change-Id: I1077ff7eb27d9ca191dc0092b7cacaaa69c40449
> > Reviewed-on: https://chromium-review.googlesource.com/420303
> > Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
> > Reviewed-by: Aaron Gable <agable@chromium.org>
> > Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
> > 
> 
> TBR=iannucci@chromium.org,agable@chromium.org,vadimsh@chromium.org,dnj@chromium.org,sebmarchand@chromium.org,chromium-reviews@chromium.org
> BUG=673940
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> 
> Change-Id: I7aa5561ad0df67831987cd8d53a84105d42d9663
> Reviewed-on: https://chromium-review.googlesource.com/420320
> Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> 

TBR=iannucci@chromium.org,agable@chromium.org,vadimsh@chromium.org,dnj@chromium.org,chromium-reviews@chromium.org,sebmarchand@chromium.org
BUG=673940
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I822312b1507003ee07930ef7527e12b997457673
Reviewed-on: https://chromium-review.googlesource.com/420321
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Robbie Iannucci 70f351e784 Revert "Stop adhoc cipd client bootstrap."
This reverts commit c6569aab12.

Reason for revert: This caused crbug.com/674363, needs further investigation.

Original change's description:
> Stop adhoc cipd client bootstrap.
> 
> This was used before to get the git installer, but now depot_tools manages its
> own copy of CIPD.
> 
> BUG=673940
> 
> Change-Id: I1077ff7eb27d9ca191dc0092b7cacaaa69c40449
> Reviewed-on: https://chromium-review.googlesource.com/420303
> Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
> 

TBR=iannucci@chromium.org,agable@chromium.org,vadimsh@chromium.org,dnj@chromium.org,sebmarchand@chromium.org,chromium-reviews@chromium.org
BUG=673940
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I7aa5561ad0df67831987cd8d53a84105d42d9663
Reviewed-on: https://chromium-review.googlesource.com/420320
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Robert Iannucci c6569aab12 Stop adhoc cipd client bootstrap.
This was used before to get the git installer, but now depot_tools manages its
own copy of CIPD.

BUG=673940

Change-Id: I1077ff7eb27d9ca191dc0092b7cacaaa69c40449
Reviewed-on: https://chromium-review.googlesource.com/420303
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
8 years ago
phajdan.jr 5224ece27c git_bootstrap.py: add a switch to control client bitness
BUG=635421, 629679

Review-Url: https://codereview.chromium.org/2280973002
9 years ago
phajdan.jr 6d0a5acdc4 Add git_bootstrap.py, which bootstraps git on Windows using CIPD
It's backwards compatible with the logic in win_tools.bat
and is intended to eventually replace it.

BUG=635421, 629679

Review-Url: https://codereview.chromium.org/2254843004
9 years ago