Эх сурвалжийг харах

Revert "put goma client in depot_tools"

This reverts commit 77780358011f8e20c68ba10aa1282f1f9f65734f.

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>
Fumitoshi Ukai 5 жил өмнө
parent
commit
a0aed87f71

+ 0 - 1
cipd_bin_setup.bat

@@ -4,4 +4,3 @@
 :: found in the LICENSE file.
 :: found in the LICENSE file.
 
 
 "%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin"
 "%~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

+ 0 - 2
cipd_bin_setup.sh

@@ -19,6 +19,4 @@ function cipd_bin_setup {
         -log-level warning \
         -log-level warning \
         -ensure-file "$ENSURE" \
         -ensure-file "$ENSURE" \
         -root "$ROOT"
         -root "$ROOT"
-
-    PYTHONDONTWRITEBYTECODE=1 python "$MYPATH/.cipd_bin/goma_ctl.py" update_hook
 }
 }

+ 0 - 8
cipd_manifest.txt

@@ -10,11 +10,6 @@
 # For these, the git revision is the one of
 # For these, the git revision is the one of
 # https://chromium.googlesource.com/infra/infra.git.
 # 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):
 # To regenerate them (after modifying this file):
 #   cipd ensure-file-resolve -ensure-file cipd_manifest.txt
 #   cipd ensure-file-resolve -ensure-file cipd_manifest.txt
 $ResolvedVersions cipd_manifest.versions
 $ResolvedVersions cipd_manifest.versions
@@ -52,6 +47,3 @@ infra/tools/bb/${platform} git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
 
 
 # CHROMEOS Buildjobs CLI
 # CHROMEOS Buildjobs CLI
 chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
-
-# goma client
-infra/goma/client/${os}-${arch=amd64} git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8

+ 0 - 12
cipd_manifest.versions

@@ -5,18 +5,6 @@ chromiumos/infra/crosjobs/linux-amd64
 	git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 	git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 	_vAeU0Q9lAxn933K8vDhwGK40zKVvV-yXGpIy43ATXAC
 	_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
 infra/tools/bb/linux-386
 	git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
 	git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
 	Ebjauqd0o3KlNnOcHxG_IP-uZsOaRDndybE6ylUF4PIC
 	Ebjauqd0o3KlNnOcHxG_IP-uZsOaRDndybE6ylUF4PIC

+ 0 - 12
goma_auth

@@ -1,12 +0,0 @@
-#!/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" "$@"

+ 0 - 8
goma_auth.bat

@@ -1,8 +0,0 @@
-@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

+ 0 - 12
goma_ctl

@@ -1,12 +0,0 @@
-#!/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" "$@"

+ 0 - 8
goma_ctl.bat

@@ -1,8 +0,0 @@
-@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