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/goma_auth.bat

13 lines
383 B
Batchfile

Reland "put goma client in depot_tools" This reverts commit a0aed87f71211aff48e3c06802d173cdf21328cf. 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 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> 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/+/1875982 Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
5 years ago
@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.
:: See revert instructions in cipd_manifest.txt
Reland "Reland "use python3 for goma related scripts"" This reverts commit fc3fb20e514c4360b8f27ab9b8124bffcc362ae3. Reason for revert: Previous versions of this changed used %scriptdir% in goma_ctl.bat and goma_auth.bat but never defined it. This eluded manual testing because these scripts would work properly as long as they were run from the depot_tools directory, but would fail when run from elsewhere. The fix to make this reland work can be found by comparing patchset 1 to patchset 3. Original change's description: > Revert "Reland "use python3 for goma related scripts"" > > This reverts commit 2a6dffaf4bc5eae2f76b6e56704b63fbcda92c55. > > Reason for revert: with this change in depot_tools when I run "goma_ctl ensure_start" from cmd.exe I get > "The system cannot find the path specified." > > Original change's description: > > Reland "use python3 for goma related scripts" > > > > This reverts commit 59140d436ad033ba607ad33e52c2abcd240dbf34. > > > > Reason for revert: > > Make this works in git bash. > > > > Original change's description: > > > Revert "use python3 for goma related scripts" > > > > > > This reverts commit 138ec7c56df78e18fd4f00e2289613aee2de8b95. > > > > > > Reason for revert: > > > This might have caused the following issue: > > > https://bugs.chromium.org/p/chromium/issues/detail?id=1221233 > > > > > > Original change's description: > > > > use python3 for goma related scripts > > > > > > > > This uses python3 like autoninja{,.bat}. > > > > https://source.chromium.org/chromium/chromium/tools/depot_tools/+/main:autoninja > > > > https://source.chromium.org/chromium/chromium/tools/depot_tools/+/main:autoninja.bat > > > > > > > > Change-Id: I4daf1892024358c5b7d88b1e32b15c82cb4411d2 > > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2968069 > > > > Commit-Queue: Dirk Pranke <dpranke@google.com> > > > > Auto-Submit: Takuto Ikuta <tikuta@chromium.org> > > > > Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com> > > > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > > > > > Change-Id: Ideb5004cf18c91c1404066622244a8527f5248f3 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2972023 > > > Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org> > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > Commit-Queue: Dirk Pranke <dpranke@google.com> > > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > > > Bug: 1221233 > > Change-Id: I815a774faa2e4fbca0f262667ea89709a09e146b > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2979560 > > Auto-Submit: Takuto Ikuta <tikuta@chromium.org> > > Reviewed-by: Allen Bauer <kylixrd@chromium.org> > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > Reviewed-by: Bruce Dawson <brucedawson@chromium.org> > > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > > Bug: 1221233 > Change-Id: I5050b9199f3076e6d6f812b8bac01e8cd1dc53bf > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2992150 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Dirk Pranke <dpranke@google.com> > Commit-Queue: Bruce Dawson <brucedawson@chromium.org> Bug: 1221233 Change-Id: I50412a5ea62f1607660cb7a7ab8851251c3dfe91 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2992151 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
4 years ago
set scriptdir=%~dp0
@call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
Reland "Reland "use python3 for goma related scripts"" This reverts commit fc3fb20e514c4360b8f27ab9b8124bffcc362ae3. Reason for revert: Previous versions of this changed used %scriptdir% in goma_ctl.bat and goma_auth.bat but never defined it. This eluded manual testing because these scripts would work properly as long as they were run from the depot_tools directory, but would fail when run from elsewhere. The fix to make this reland work can be found by comparing patchset 1 to patchset 3. Original change's description: > Revert "Reland "use python3 for goma related scripts"" > > This reverts commit 2a6dffaf4bc5eae2f76b6e56704b63fbcda92c55. > > Reason for revert: with this change in depot_tools when I run "goma_ctl ensure_start" from cmd.exe I get > "The system cannot find the path specified." > > Original change's description: > > Reland "use python3 for goma related scripts" > > > > This reverts commit 59140d436ad033ba607ad33e52c2abcd240dbf34. > > > > Reason for revert: > > Make this works in git bash. > > > > Original change's description: > > > Revert "use python3 for goma related scripts" > > > > > > This reverts commit 138ec7c56df78e18fd4f00e2289613aee2de8b95. > > > > > > Reason for revert: > > > This might have caused the following issue: > > > https://bugs.chromium.org/p/chromium/issues/detail?id=1221233 > > > > > > Original change's description: > > > > use python3 for goma related scripts > > > > > > > > This uses python3 like autoninja{,.bat}. > > > > https://source.chromium.org/chromium/chromium/tools/depot_tools/+/main:autoninja > > > > https://source.chromium.org/chromium/chromium/tools/depot_tools/+/main:autoninja.bat > > > > > > > > Change-Id: I4daf1892024358c5b7d88b1e32b15c82cb4411d2 > > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2968069 > > > > Commit-Queue: Dirk Pranke <dpranke@google.com> > > > > Auto-Submit: Takuto Ikuta <tikuta@chromium.org> > > > > Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com> > > > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > > > > > Change-Id: Ideb5004cf18c91c1404066622244a8527f5248f3 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2972023 > > > Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org> > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > Commit-Queue: Dirk Pranke <dpranke@google.com> > > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > > > Bug: 1221233 > > Change-Id: I815a774faa2e4fbca0f262667ea89709a09e146b > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2979560 > > Auto-Submit: Takuto Ikuta <tikuta@chromium.org> > > Reviewed-by: Allen Bauer <kylixrd@chromium.org> > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > Reviewed-by: Bruce Dawson <brucedawson@chromium.org> > > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > > Bug: 1221233 > Change-Id: I5050b9199f3076e6d6f812b8bac01e8cd1dc53bf > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2992150 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Dirk Pranke <dpranke@google.com> > Commit-Queue: Bruce Dawson <brucedawson@chromium.org> Bug: 1221233 Change-Id: I50412a5ea62f1607660cb7a7ab8851251c3dfe91 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2992151 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
4 years ago
@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_auth.py %*
exit /b %ERRORLEVEL%