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

Roll python to actually correct packages.

Browse Source 
For bonus points, this also fixes PRESUBMIT so that it actually checks
the manifests.

TBR=bpastene@chromium.org, tandrii@chromium.org

Bug: 1032743
Change-Id: I4dac5a520e333e3c429597684a44ece83d21c5fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1960950
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
This commit is contained in:
Robert Iannucci
2019-12-10 22:46:56 +00:00
committed by Commit Bot
parent 6865d13248
commit ee67b97daa
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PRESUBMIT.py
View File

@@ -100,8 +100,8 @@ def CommonChecks(input_api, output_api, tests_to_black_list, run_on_python3):
rel_file = lambda rel: input_api.os_path.join(root, rel)
cipd_manifests = set(rel_file(input_api.os_path.join(*x)) for x in (
('cipd_manifest.txt',),
('bootstrap', 'win', 'manifest.txt'),
('bootstrap', 'win', 'manifest_bleeding_edge.txt'),
('bootstrap', 'manifest.txt'),
('bootstrap', 'manifest_bleeding_edge.txt'),
# Also generate a file for the cipd client itself.
('cipd_client_version',),

4
bootstrap/manifest.txt
View File

@@ -18,10 +18,10 @@
$VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64
@Subdir python
infra/python/cpython/${platform} version:2.7.17.chromium.22
infra/3pp/tools/cpython/${platform} version:2.7.17.chromium.22
@Subdir python3
infra/python/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
infra/3pp/tools/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
@Subdir git
infra/3pp/tools/git/${os}-${arch} version:2.24.1.chromium.5

4
bootstrap/manifest_bleeding_edge.txt
View File

@@ -18,10 +18,10 @@
$VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64
@Subdir python
infra/python/cpython/${platform} version:2.7.17.chromium.22
infra/3pp/tools/cpython/${platform} version:2.7.17.chromium.22
@Subdir python3
infra/python/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
infra/3pp/tools/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
@Subdir git
infra/3pp/tools/git/${os}-${arch} version:2.24.1.chromium.5