Retry switching to use CIPD ninja v1.8.2
This reverts commitchanges/63/3696963/100a5bae7ebc+ some modifications on recipe module. The previous CL https://crrev.com/c/3697958 ensures depot_tools/.cipd_bin in recipe environments. This CL copies ninja.exe from .cipd_bin to depot_tools root as cipd_bin_setup.bat. For developers, it's expected to run update_depot_tools which triggers cipd_bin_setup. For CI/CQ, depot_tools._cipd_bin_setup() should be called before using ninja/autoninja recipe module APIs. Builds with depot_tools recipe bundle are tested using led. # Windows > led get-build 8811491780369249585 | led edit-recipe-bundle -O depot_tools="$HOME/depot_tools" | led launch https://ci.chromium.org/swarming/task/5b7512ee9d91fc10? # Linux > led get-build 8811504372914233697 | led edit-recipe-bundle -O depot_tools="$HOME/depot_tools" | led launch https://ci.chromium.org/swarming/task/5b7515832d0f7c10 Original change's description: > Revert "Switch to use CIPD ninja v1.8.2" > > This reverts commitc90a982106. > > Reason for revert: > https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8811949917908303825/+/u/compile/stdout > > Original change's description: > > Switch to use CIPD ninja v1.8.2 > > > > https://crrev.com/c/3674981 installed CIPD ninja packages. > > This CL switches from the old ninja binaries to them. > > > > Note that this CL doesn't change ninja version. the old/CIPD ninja binaries are v1.8.2. > > > > The differences from the old binaries are > > - the CIPD packages don't use chromium's clang. > > - the CIPD package for Linux doesn't use chromium's sysroot. > > - the min macOS version is 10.13, which was 10.6. > > Please also see https://crsrc.org/i/3pp/ninja/install_bootstrap.sh > > > > > > On Windows, ninja.exe will be installed under .cipd_bin. > > But there are many places that assume that ninja.exe exists on depot_tools root. So this CL also copies the ninja.exe from .cipd_bin to root in cipd_bin_setup.bat. > > > > Bug: 931218 > > Change-Id: Ib67eee5e9b6ad9b2937b789626970d9c85867dbd > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3674982 > > Commit-Queue: Junji Watanabe <jwata@google.com> > > Reviewed-by: Philipp Wollermann <philwo@google.com> > > Reviewed-by: Takuto Ikuta <tikuta@chromium.org> > > Reviewed-by: Nico Weber <thakis@chromium.org> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 931218 > Change-Id: I08d61dad119a0d23ae9ec8b1ed787dd3915de697 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3686854 > Auto-Submit: Takuto Ikuta <tikuta@chromium.org> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > Owners-Override: Takuto Ikuta <tikuta@chromium.org> Bug: 931218 Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: build_limited Recipe-Nontrivial-Roll: chrome_release Recipe-Nontrivial-Roll: infra Change-Id: Ic7a9395c0e858823375f1a6ec79034dbc54230bb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3696963 Reviewed-by: Fumitoshi Ukai <ukai@google.com> Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Junji Watanabe <jwata@google.com> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Junji Watanabe
3 years ago
committed by
LUCI CQ
parent
407333d424
commit
3133f98f3f
@ -1,40 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright (c) 2012 Google Inc. All rights reserved.
|
||||
# Copyright 2022 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
OS="$(uname -s)"
|
||||
THIS_DIR="$(dirname "${0}")"
|
||||
# See revert instructions in cipd_manifest.txt
|
||||
|
||||
function print_help() {
|
||||
cat <<-EOF
|
||||
No prebuilt ninja binary was found for this system.
|
||||
Try building your own binary by doing:
|
||||
cd ~
|
||||
git clone https://github.com/ninja-build/ninja.git -b v1.8.2
|
||||
cd ninja && ./configure.py --bootstrap
|
||||
Then add ~/ninja/ to your PATH.
|
||||
EOF
|
||||
}
|
||||
MYPATH="$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
case "$OS" in
|
||||
Linux)
|
||||
MACHINE=$(uname -m)
|
||||
case "$MACHINE" in
|
||||
x86_64)
|
||||
exec "${THIS_DIR}/ninja-linux64" "$@";;
|
||||
*)
|
||||
echo Unsupported architecture \($MACHINE\) -- unable to run ninja.
|
||||
print_help
|
||||
exit 1;;
|
||||
esac
|
||||
;;
|
||||
Darwin) exec "${THIS_DIR}/ninja-mac" "$@";;
|
||||
CYGWIN*) exec cmd.exe /c $(cygpath -t windows $0).exe "$@";;
|
||||
MINGW*) cmd.exe //c $0.exe "$@";;
|
||||
MSYS_NT*) cmd.exe //c $0.exe "$@";;
|
||||
*) echo "Unsupported OS ${OS}"
|
||||
print_help
|
||||
exit 1;;
|
||||
esac
|
||||
exec "$MYPATH/.cipd_bin/ninja" "$@"
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue