Commit 77780358 authored by Fumitoshi Ukai's avatar Fumitoshi Ukai Committed by Commit Bot

put goma client in depot_tools

install goma client cipd package in depot_tools.

should not use $MYPATH/goma_ctl in cipd_bin_setup
since $MYPATH/goma_ctl uses cipd_bin_setup in itself,
so causing recursive calls.
invoke python to run .cipd/goma_ctl.py in cipd_bin_setup
instead.

Bug: b/77663154
Change-Id: I9f82c766a886a2acfb899e3594e5f05a7b7bc75a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1866350Reviewed-by: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: 's avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
parent acf922ce
......@@ -4,3 +4,4 @@
:: found in the LICENSE file.
"%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin"
call python.bat "%~dp0\.cipd_bin\goma_ctl.py" update_hook
......@@ -19,4 +19,6 @@ function cipd_bin_setup {
-log-level warning \
-ensure-file "$ENSURE" \
-root "$ROOT"
PYTHONDONTWRITEBYTECODE=1 python "$MYPATH/.cipd_bin/goma_ctl.py" update_hook
}
......@@ -10,6 +10,11 @@
# For these, the git revision is the one of
# https://chromium.googlesource.com/infra/infra.git.
#
# For goma client, generated via builders at
# https://ci.chromium.org/p/infra-internal/g/goma-client/console
# the git revision is the one of
# https://chromium.googlesource.com/infra/goma/client.git
#
# To regenerate them (after modifying this file):
# cipd ensure-file-resolve -ensure-file cipd_manifest.txt
$ResolvedVersions cipd_manifest.versions
......@@ -47,3 +52,6 @@ infra/tools/bb/${platform} git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
# CHROMEOS Buildjobs CLI
chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
# goma client
infra/goma/client/${os}-${arch=amd64} git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
......@@ -5,6 +5,18 @@ chromiumos/infra/crosjobs/linux-amd64
git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
_vAeU0Q9lAxn933K8vDhwGK40zKVvV-yXGpIy43ATXAC
infra/goma/client/linux-amd64
git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
foM8y4-U9H2vqYFss0qr012VYISzHCuqxrP6fYm6XjUC
infra/goma/client/mac-amd64
git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
DESRA5A06iQDrxRkNuftoCEi4ig8uAJzbbGa6YYtdz4C
infra/goma/client/windows-amd64
git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
SvCnuszdUOGoAw4JSzCP1WNPMIw3znGS6I0XucJwulsC
infra/tools/bb/linux-386
git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
Ebjauqd0o3KlNnOcHxG_IP-uZsOaRDndybE6ylUF4PIC
......
#!/usr/bin/env bash
# Copyright 2019 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.
MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null
PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_auth.py" "$@"
@echo off
:: Copyright 2019 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.
@call "%~dp0\cipd_bin_setup.bat" > null 2>&1
@call python.bat %~dp0\.cipd_bin\goma_auth.py %*
exit /b
#!/usr/bin/env bash
# Copyright 2019 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.
MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null
PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_ctl.py" "$@"
@echo off
:: Copyright 2019 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.
@call "%~dp0\cipd_bin_setup.bat" > null 2>&1
@call python.bat %~dp0\.cipd_bin\goma_ctl.py %*
exit /b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment