You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
depot_tools/update_depot_tools

133 lines
3.9 KiB
Plaintext

#!/usr/bin/env bash
# Copyright (c) 2012 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.
# This script will try to sync the bootstrap directories and then defer control.
if [ "$USER" == "root" ];
then
echo Running depot tools as root is sad.
exit
fi
# Export for other depot_tools scripts to re-use.
export DEPOT_TOOLS_DIR="${DEPOT_TOOLS_DIR:-$(dirname "$0")}"
# Test if this script is running under a MSYS install. This is likely an error
# if it is, so we warn the user accordingly.
OUTPUT="$(uname | grep 'MSYS')"
MSYS=$?
if [ $MSYS = 0 ]; then
echo 'WARNING: It looks like you are running these tools from an MSYS shell'
echo '(as opposed to a MinGW shell). This shell is not supported and may'
echo 'fail in mysterious ways.'
echo
echo 'To run the supported MinGW shell, use `git bash`, or use `bin/bash.exe`'
echo 'in your MinGW installation, as opposed to `usr/bin/bash.exe`.'
echo
fi
base_dir="${DEPOT_TOOLS_DIR}"
if [ -e "$base_dir/.disable_auto_update" ]; then
exit
fi
# Test if this script is running under a MinGW install. If it is, we will
# hardcode the paths to Git where possible.
OUTPUT="$(uname | grep 'MINGW')"
MINGW=$?
# We want to update the bundled tools even under MinGW.
if [ $MINGW = 0 ]; then
$COMSPEC //c `cygpath -w "$base_dir/bootstrap/win_tools.bat"`
case $? in
123)
# msys environment was upgraded, need to quit.
exit 123
;;
0)
;;
*)
exit $?
esac
fi
GIT="git"
if [ -e "$base_dir/git.bat" -a $MINGW = 0 ]; then
GIT="cmd.exe //c \"$base_dir\\git.bat\""
fi
# Test git and git --version.
function test_git {
local GITV
GITV="$(eval "$GIT" --version)" || {
echo "git isn't installed, please install it"
exit 1
}
GITV="${GITV##* }" # Only examine last word (i.e. version number)
local GITD=( ${GITV//./ } ) # Split version number into decimals
if ((GITD[0] < 1 || (GITD[0] == 2 && GITD[1] < 8) )); then
echo "git version is ${GITV}, please update to a version later than 2.8"
exit 1
fi
}
Handle updating depot_tools repos that are git cloned. Until recently, no proper Git clone of depot_tools existed. All Git clones were set up locally via git svn clone. The way repos of that type are updated is via 'git svn rebase'. Now, a supported Git clone of depot_tools exists. The update process for repos of this type is via 'git fetch' and 'git rebase'. Modify the update_depot_tools* scripts so they can update depot_tools for git cloned or git svn cloned methods. This also means that git svn is no longer required, so move that test after we check for git cloned repos. R=maruel@chromium.org TEST=Linux + git clone: on Linux, git clone https://git.chromium.org/chromium/tools/depot_tools.git. Apply and commit this patch locally. Note commit hash of HEAD. Run 'git reset --hard "HEAD^^^"'. Run 'git cherry-pick HASH_OF_UPDATE_CHANGE'. Run './update_depot_tools'. Verify depot_tools is updated to latest available revision + this change. TEST=Linux + git svn clone: on Linux, git svn clone svn://svn.chromium.org/chrome/trunk/tools/depot_tools. Apply and commit this patch locally. Note commit hash of HEAD. Run 'git reset --hard "HEAD^^^"'. Run 'git cherry-pick HASH_OF_UPDATE_CHANGE'. Run './update_depot_tools'. Verify depot_tools is updated to latest available revision + this change. TEST=Windows command prompt + git clone: on Windows command prompt, run Linux+git clone test, except use update_depot_tools.bat. Verify depot_tools is updated to latest available revision + this change. TEST=Windows command prompt + git svn clone: on Windows command prompt, run Linux+git svn clone test, except use update_depot_tools.bat. Verify depot_tools is updated to latest available revision + this change. TEST=Windows cygwin + git clone: on Windows command prompt, run Linux+git clone test. Verify depot_tools is updated to latest available revision + this change. TEST=Windows cygwin + git svn clone: on Windows command prompt, run Linux+git svn clone test. Verify depot_tools is updated to latest available revision + this change. Review URL: https://chromiumcodereview.appspot.com/10263004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134732 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
function update_git_repo {
remote_url=$(eval "$GIT" config --get remote.origin.url)
local GIT_CMD_TXT STATUS
GIT_CMD_TXT=$(git fetch -q origin main 2>&1)
STATUS=$?
if [[ $STATUS -ne 0 ]]; then
echo "depot_tools update failed. Couldn't fetch main branch."
echo "Retry later or reclone depot_tools" >&2
echo "$GIT_CMD_TXT" >&2
else
GIT_CMD_TXT=$(git checkout -q origin/main 2>&1)
STATUS=$?
if [[ $STATUS -ne 0 ]]; then
echo "depot_tools update failed. Conflict in $base_dir" >&2
echo "$GIT_CMD_TXT" >&2
fi
Handle updating depot_tools repos that are git cloned. Until recently, no proper Git clone of depot_tools existed. All Git clones were set up locally via git svn clone. The way repos of that type are updated is via 'git svn rebase'. Now, a supported Git clone of depot_tools exists. The update process for repos of this type is via 'git fetch' and 'git rebase'. Modify the update_depot_tools* scripts so they can update depot_tools for git cloned or git svn cloned methods. This also means that git svn is no longer required, so move that test after we check for git cloned repos. R=maruel@chromium.org TEST=Linux + git clone: on Linux, git clone https://git.chromium.org/chromium/tools/depot_tools.git. Apply and commit this patch locally. Note commit hash of HEAD. Run 'git reset --hard "HEAD^^^"'. Run 'git cherry-pick HASH_OF_UPDATE_CHANGE'. Run './update_depot_tools'. Verify depot_tools is updated to latest available revision + this change. TEST=Linux + git svn clone: on Linux, git svn clone svn://svn.chromium.org/chrome/trunk/tools/depot_tools. Apply and commit this patch locally. Note commit hash of HEAD. Run 'git reset --hard "HEAD^^^"'. Run 'git cherry-pick HASH_OF_UPDATE_CHANGE'. Run './update_depot_tools'. Verify depot_tools is updated to latest available revision + this change. TEST=Windows command prompt + git clone: on Windows command prompt, run Linux+git clone test, except use update_depot_tools.bat. Verify depot_tools is updated to latest available revision + this change. TEST=Windows command prompt + git svn clone: on Windows command prompt, run Linux+git svn clone test, except use update_depot_tools.bat. Verify depot_tools is updated to latest available revision + this change. TEST=Windows cygwin + git clone: on Windows command prompt, run Linux+git clone test. Verify depot_tools is updated to latest available revision + this change. TEST=Windows cygwin + git svn clone: on Windows command prompt, run Linux+git svn clone test. Verify depot_tools is updated to latest available revision + this change. Review URL: https://chromiumcodereview.appspot.com/10263004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134732 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
fi
# Having python3 on depot_tools causes problems if users put depot_tools in
# PATH before system's python3, so remove it if present.
# See crbug.com/1017812.
if [[ -e python3 ]]; then
rm python3
fi
return $STATUS
}
# Update git checkouts.
if [ "X$DEPOT_TOOLS_UPDATE" = "X0" ]; then
echo "DEPOT_TOOLS_UPDATE environment variable is 0, skipping update. Set DEPOT_TOOLS_UPDATE to 1 to force update." >&2
else
if [ -e "$base_dir/.git" ]; then
cd "$base_dir"
update_git_repo
Reland "Make depot_tools scripts return exit codes properly on all platforms." This reverts commit 6754c49e02b62d54b9b5d8b8b8a93e77bae935f8. Reason for revert: will be relanded with fixed batch comments that triggered parser error. Original change's description: > Revert "Make depot_tools scripts return exit codes properly on all platforms." > > This reverts commit 7c4f7ec40818ddd883aa0a3b132cea06af92a713. > > Reason for revert: bugs reported by users (see comments in Gerrit). > error: block. was unexpected at this time. > > Original change's description: > > Make depot_tools scripts return exit codes properly on all platforms. > > > > Changes: > > 1. Windows: exit /b %errorlevel% should be used instead of goto :EOF to get valid exit codes during cmd /c <script>.bat invocation. > > 2. Windows: delayed var expansion is required in update_depot_tools.bat exit code generation. > > 3. Posix: update_depot_tools returns exit code from update_git_repo function in case of a failure. > > > > A rule of thumb on Windows: goto :EOF should not be used if %errorlevel% must be returned for all possible invocations. > > > > Test case for update_depot_tools changes: > > 1. Make a change to depot_tools sources that will conflict with next depot_tools update > > 2. Run update_depot_tools either directly or via gclient > > 3. Expect a git error is triggered > > 4. Inspect %errorlevel% or $? depending on platform > > 5. Expected 1, but the actual result is 0. > > > > Test case for changes in other .bat files: > > 1. Make a change to depot_tools sources that will conflict with next depot_tools update > > 2. Run cmd /c gclient > > 3. Expect a git error is triggered > > 4. Inspect %errorlevel% > > 5. Expected 1, but the actual result is 0. > > > > Change-Id: I64459982bcd9cc3db1319a9b39224b7a7af8c5aa > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3688632 > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Commit-Queue: Josip Sokcevic <sokcevic@google.com> > > Auto-Submit: Aleksey Khoroshilov <akhoroshilov@brave.com> > > Reviewed-by: Bruce Dawson <brucedawson@chromium.org> > > Change-Id: I85d598af01d75588cdee77165d6af22270ee031d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3694139 > Auto-Submit: Josip Sokcevic <sokcevic@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Change-Id: I377f966ea1b1a567de815caca703b5e124a76b64 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3696396 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Reviewed-by: Bruce Dawson <brucedawson@chromium.org> Commit-Queue: Josip Sokcevic <sokcevic@google.com> Auto-Submit: Aleksey Khoroshilov <akhoroshilov@brave.com>
3 years ago
UPDATE_RESULT=$?
cd - > /dev/null
Reland "Make depot_tools scripts return exit codes properly on all platforms." This reverts commit 6754c49e02b62d54b9b5d8b8b8a93e77bae935f8. Reason for revert: will be relanded with fixed batch comments that triggered parser error. Original change's description: > Revert "Make depot_tools scripts return exit codes properly on all platforms." > > This reverts commit 7c4f7ec40818ddd883aa0a3b132cea06af92a713. > > Reason for revert: bugs reported by users (see comments in Gerrit). > error: block. was unexpected at this time. > > Original change's description: > > Make depot_tools scripts return exit codes properly on all platforms. > > > > Changes: > > 1. Windows: exit /b %errorlevel% should be used instead of goto :EOF to get valid exit codes during cmd /c <script>.bat invocation. > > 2. Windows: delayed var expansion is required in update_depot_tools.bat exit code generation. > > 3. Posix: update_depot_tools returns exit code from update_git_repo function in case of a failure. > > > > A rule of thumb on Windows: goto :EOF should not be used if %errorlevel% must be returned for all possible invocations. > > > > Test case for update_depot_tools changes: > > 1. Make a change to depot_tools sources that will conflict with next depot_tools update > > 2. Run update_depot_tools either directly or via gclient > > 3. Expect a git error is triggered > > 4. Inspect %errorlevel% or $? depending on platform > > 5. Expected 1, but the actual result is 0. > > > > Test case for changes in other .bat files: > > 1. Make a change to depot_tools sources that will conflict with next depot_tools update > > 2. Run cmd /c gclient > > 3. Expect a git error is triggered > > 4. Inspect %errorlevel% > > 5. Expected 1, but the actual result is 0. > > > > Change-Id: I64459982bcd9cc3db1319a9b39224b7a7af8c5aa > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3688632 > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Commit-Queue: Josip Sokcevic <sokcevic@google.com> > > Auto-Submit: Aleksey Khoroshilov <akhoroshilov@brave.com> > > Reviewed-by: Bruce Dawson <brucedawson@chromium.org> > > Change-Id: I85d598af01d75588cdee77165d6af22270ee031d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3694139 > Auto-Submit: Josip Sokcevic <sokcevic@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Change-Id: I377f966ea1b1a567de815caca703b5e124a76b64 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3696396 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Reviewed-by: Bruce Dawson <brucedawson@chromium.org> Commit-Queue: Josip Sokcevic <sokcevic@google.com> Auto-Submit: Aleksey Khoroshilov <akhoroshilov@brave.com>
3 years ago
if [[ $UPDATE_RESULT -ne 0 ]]; then
exit $UPDATE_RESULT
fi
else
echo "Warning: Your depot_tools directory does not appear to be a git repository, and cannot be updated." 1>&2
echo "Consider deleting your depot_tools directory and following the instructions at https://www.chromium.org/developers/how-tos/install-depot-tools/ to reinstall it." 1>&2
fi
# Sync CIPD-boostrapped packages.
Revert "Reland "depot_tools: Bootstrap Python 3 on Linux/Mac"" This reverts commits 0e85f633c7c4364f4d616e9e13dce2c9a9dd518e and 9d25ad41920eff43a8249f663e5f66d7d1b89d5f. 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 dbca865e55f706efc3843eab2e88a65aa810be49 > > 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
source "$base_dir/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null
Revert "Reland "depot_tools: Bootstrap Python 3 on Linux/Mac"" This reverts commits 0e85f633c7c4364f4d616e9e13dce2c9a9dd518e and 9d25ad41920eff43a8249f663e5f66d7d1b89d5f. 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 dbca865e55f706efc3843eab2e88a65aa810be49 > > 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
# Don't bootstrap Python 3 on windows, since it is already done by
# bootstrap/win_tools.bat.
if [ "X$MINGW" != "X0" -a "X$DEPOT_TOOLS_BOOTSTRAP_PYTHON3" != "X0" ]; then
source "$base_dir/bootstrap_python3"
bootstrap_python3
fi
fi