Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: update goma to a new version (#13962)

Browse source
This commit is contained in:
Andrey Lushnikov 2022-05-05 05:14:17 -06:00 committed by GitHub
parent d2ee253d07
commit 5338bc0065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
browser_patches/chromium/goma.sh
View file

@ -7,7 +7,7 @@ cd "$(dirname "$0")"
SCRIPT_FOLDER=$(pwd -P) SCRIPT_FOLDER=$(pwd -P)
source "${SCRIPT_FOLDER}/../utils.sh" source "${SCRIPT_FOLDER}/../utils.sh"
ELECTRON_BUILD_TOOLS_REQUIRED_VERSION=6ba8962529c37727a778691b89c92ab0eb1d9d87 ELECTRON_BUILD_TOOLS_REQUIRED_VERSION=2c24fb5c7c938a4e387f355ab64be449604ae5db
if [[ -d ./electron-build-tools ]]; then if [[ -d ./electron-build-tools ]]; then
cd ./electron-build-tools cd ./electron-build-tools
# Make sure required commit is part of electron-build-tools. # Make sure required commit is part of electron-build-tools.
@ -23,13 +23,23 @@ fi
if [[ ! -d ./electron-build-tools ]]; then if [[ ! -d ./electron-build-tools ]]; then
git clone --single-branch --branch main https://github.com/electron/build-tools/ electron-build-tools git clone --single-branch --branch main https://github.com/electron/build-tools/ electron-build-tools
cd electron-build-tools cd electron-build-tools
git checkout 926e1a2f2926b9a7663ae865c3bd9a1b1d366393
npm install npm install
mkdir -p third_party mkdir -p third_party
./src/e update-goma msftGoma ./src/e update-goma msftGoma
cd .. cd ..
fi fi
if ! is_win; then
if command -v python >/dev/null; then
PYTHON=python
elif command -v python3 >/dev/null; then
PYTHON=python3
else
echo "ERROR: no python or python3 found in PATH"
exit 1
fi
fi
cd electron-build-tools/third_party/goma cd electron-build-tools/third_party/goma
export GOMA_START_COMPILER_PROXY=true export GOMA_START_COMPILER_PROXY=true
@ -52,7 +62,7 @@ elif [[ $1 == "login" ]]; then
if is_win; then if is_win; then
/c/Windows/System32/cmd.exe "/c $(cygpath -w $(pwd)/goma_auth.bat) login" /c/Windows/System32/cmd.exe "/c $(cygpath -w $(pwd)/goma_auth.bat) login"
else else
python ./goma_auth.py login $PYTHON ./goma_auth.py login
fi fi
echo echo
echo "Congratulation! Goma is logged in!" echo "Congratulation! Goma is logged in!"
@ -71,7 +81,7 @@ elif [[ $1 == "start" ]]; then
if is_win; then if is_win; then
/c/Windows/System32/cmd.exe "/c $(cygpath -w $(pwd)/goma_ctl.bat) ensure_start" /c/Windows/System32/cmd.exe "/c $(cygpath -w $(pwd)/goma_ctl.bat) ensure_start"
else else
python ./goma_ctl.py ensure_start $PYTHON ./goma_ctl.py ensure_start
fi fi
set +x set +x
echo echo
@ -86,7 +96,7 @@ elif [[ $1 == "stop" ]]; then
if is_win; then if is_win; then
/c/Windows/System32/cmd.exe "/c $(cygpath -w $(pwd)/goma_ctl.bat) stop" /c/Windows/System32/cmd.exe "/c $(cygpath -w $(pwd)/goma_ctl.bat) stop"
else else
python ./goma_ctl.py stop $PYTHON ./goma_ctl.py stop
fi fi
else else
echo "ERROR: unknown command - $1" echo "ERROR: unknown command - $1"