From 5bff883c40444ccb3a7f1b2bc94759a395bed32c Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 5 Jul 2024 09:44:34 +0200 Subject: [PATCH] chore: clean up outdated goma references (#42762) --- .circleci/config/base.yml | 2 +- .devcontainer/README.md | 14 ++++++++++++-- .devcontainer/on-create-command.sh | 1 - .github/actions/build-electron/action.yml | 1 - appveyor-woa.yml | 2 +- appveyor.yml | 2 +- docs/development/goma.md | 6 ------ 7 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 docs/development/goma.md diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 757faacae9..95afdbd281 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -445,7 +445,7 @@ step-mksnapshot-build: &step-mksnapshot-build fi sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args - sed $SEDOPTION '/The gn arg use_goma=true .*/d' out/Default/mksnapshot_args + if [ "`uname`" != "Darwin" ]; then if [ "$TARGET_ARCH" == "arm" ]; then electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot diff --git a/.devcontainer/README.md b/.devcontainer/README.md index 255596b6b1..9cfac35885 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -25,9 +25,19 @@ Codespaces doesn't lean very well into gclient based checkouts, the directory st /workspaces/electron ``` -## Goma +## Reclient -If you are a maintainer [with Goma access](../docs/development/goma.md) it should be automatically configured and authenticated when you spin up a new codespaces instance. You can validate this by checking `e d goma_auth info` or by checking that your build-tools configuration has a goma mode of `cluster`. +If you are a maintainer [with Reclient access](../docs/development/reclient.md) you'll need to ensure you're authenticated when you spin up a new codespaces instance. You can validate this by checking `e d rbe info` - your build-tools configuration should have `Access` type `Cache & Execute`: + +```console +Authentication Status: Authenticated +Since: 2024-05-28 10:29:33 +0200 CEST +Expires: 2024-08-26 10:29:33 +0200 CEST +... +Access: Cache & Execute +``` + +To authenticate if you're not logged in, run `e d rbe login` and follow the link to authenticate. ## Running Electron diff --git a/.devcontainer/on-create-command.sh b/.devcontainer/on-create-command.sh index e168a5f0a5..b6a9318d97 100755 --- a/.devcontainer/on-create-command.sh +++ b/.devcontainer/on-create-command.sh @@ -59,7 +59,6 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then \"\$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\", \"configValidationLevel\": \"strict\", \"reclient\": \"$1\", - \"goma\": \"none\", \"preserveXcode\": 5 } " >$buildtools/configs/evm.testing.json diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 622cf6d901..dcf24aec4c 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -90,7 +90,6 @@ runs: fi sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args - sed $SEDOPTION '/The gn arg use_goma=true .*/d' out/Default/mksnapshot_args if [ "`uname`" = "Linux" ]; then if [ "${{ inputs.target-arch }}" = "arm" ]; then diff --git a/appveyor-woa.yml b/appveyor-woa.yml index 0b525168a3..07d24afc1c 100644 --- a/appveyor-woa.yml +++ b/appveyor-woa.yml @@ -149,7 +149,7 @@ for: - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args # Remove unused args from mksnapshot_args - ps: >- - Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') -And -not $_.Contains('The gn arg use_goma=true') } | Set-Content out/Default/mksnapshot_args + Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args - autoninja -C out/Default electron:electron_mksnapshot_zip - cd out\Default - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S diff --git a/appveyor.yml b/appveyor.yml index 7f969ca1db..f288f28331 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -147,7 +147,7 @@ for: - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args # Remove unused args from mksnapshot_args - ps: >- - Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') -And -not $_.Contains('The gn arg use_goma=true') } | Set-Content out/Default/mksnapshot_args + Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args - autoninja -C out/Default electron:electron_mksnapshot_zip - cd out\Default - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S diff --git a/docs/development/goma.md b/docs/development/goma.md deleted file mode 100644 index 21d6ed93ce..0000000000 --- a/docs/development/goma.md +++ /dev/null @@ -1,6 +0,0 @@ -# Goma - -> Goma is a distributed compiler service for open-source projects such as -> Chromium and Android. - -Electron's deployment of Goma is deprecated and we are gradually shifting all usage to the [reclient](reclient.md) system. At some point in 2024 the Goma backend will be shutdown.