Commit 27bd4e42 authored by Fumitoshi Ukai's avatar Fumitoshi Ukai Committed by Commit Bot

Reland "put goma client in depot_tools"

This reverts commit a0aed87f.

Reason for revert: install goma client without update_hook

update_hook would disrupt current users, so start without update_hook,
which means goma cient in depot_tools user might need to
restart compiler_proxy manually when updated.
 https://docs.google.com/document/d/1pnwfkU6Rd9dRtQC0sg2vATmyRbkYWhnNUTD5k1PddC0/edit#

Original change's description:
> Revert "put goma client in depot_tools"
>
> This reverts commit 77780358.
>
> Reason for revert: AttributeError: 'GomaEnvPosix' object has no attribute 'RestartCompilerProxy'
>
> Original change's description:
> > 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/+/1866350
> > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> > Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
>
> TBR=sque@chromium.org,ukai@chromium.org,yyanagisawa@google.com,vadimsh@chromium.org,dpranke@chromium.org,tikuta@chromium.org,ehmaldonado@chromium.org,yekuang@google.com
>
> Change-Id: Ie050dfb524dd885634c31be829d733613e80aece
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: b/77663154
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1872129
> Reviewed-by: Fumitoshi Ukai <ukai@chromium.org>
> Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>

TBR=sque@chromium.org,ukai@chromium.org,yyanagisawa@google.com,vadimsh@chromium.org,dpranke@chromium.org,tikuta@chromium.org,ehmaldonado@chromium.org,yekuang@google.com


Bug: b/77663154
Change-Id: I8bb51631e4418ff63953099814bdb464128eb279
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1875982Reviewed-by: 's avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
parent 1e4dbf3f
......@@ -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:21891516eb1a45c1db85325b3b0e745574e5f77d
......@@ -5,6 +5,18 @@ chromiumos/infra/crosjobs/linux-amd64
git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
_vAeU0Q9lAxn933K8vDhwGK40zKVvV-yXGpIy43ATXAC
infra/goma/client/linux-amd64
git_revision:21891516eb1a45c1db85325b3b0e745574e5f77d
QfsM_lNTY7qKrNUD5ZYFczJGEKbVb2s0o32BTAhMa4kC
infra/goma/client/mac-amd64
git_revision:21891516eb1a45c1db85325b3b0e745574e5f77d
-yF6GqyKeyyr8ZPiOPqDchuIQ8916IG-4Z6bT9KO5PsC
infra/goma/client/windows-amd64
git_revision:21891516eb1a45c1db85325b3b0e745574e5f77d
Dd-Urs0Fy5gYb88c0Tq5xxKR2xiyW3NyIqNJUiv1nn4C
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