Merge branch 'electron:main' into main

Author: EladBahar

.github/workflows/lint.yml

@@ -26,12 +26,12 @@ jobs:
         git config --global core.eol lf
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # tag: v4.2.2
     - name: Setup Node.js
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a  # tag: v4.2.0
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020  # tag: v4.4.0
       with:
         node-version: lts/-1
     - name: Cache node_modules
       id: cache-node-modules
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57  # tag: v4.2.0
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684  # tag: v4.2.3
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}-node-modules

.github/workflows/test.yml

@@ -30,18 +30,19 @@ jobs:
         git config --global core.eol lf
         git config --global core.filemode false
         git config --global core.fscache true
+        git config --global core.longpaths true
         git config --global core.preloadindex true
         git config --global branch.autosetuprebase always
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # tag: v4.2.2
       with:
         fetch-depth: 1
     - name: Setup Node.js
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a  # tag: v4.2.0
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020  # tag: v4.4.0
       with:
         node-version: lts/-1
     - name: Cache node_modules
       id: cache-node-modules
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57  # tag: v4.2.0
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684  # tag: v4.2.3
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}-node-modules

.github/workflows/validate-configs.yml

@@ -16,17 +16,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Validate JSON schema
-        uses: dsanders11/json-schema-validate-action@ec60131eddf6f51ed0c737fdcd28616ae1a0e564 # v1.2.0
+        uses: dsanders11/json-schema-validate-action@79b2d95a446a0d786f7f244ae7764f8370ff3657 # v1.4.0
         with:
           schema: json-schema
           files: evm-config.schema.json
       - name: Validate GitHub Actions workflows
-        uses: dsanders11/json-schema-validate-action@ec60131eddf6f51ed0c737fdcd28616ae1a0e564 # v1.2.0
+        uses: dsanders11/json-schema-validate-action@79b2d95a446a0d786f7f244ae7764f8370ff3657 # v1.4.0
         with:
           schema: https://json.schemastore.org/github-workflow.json
           files: .github/workflows/*.yml
       - name: Validate .prettierrc.json
-        uses: dsanders11/json-schema-validate-action@ec60131eddf6f51ed0c737fdcd28616ae1a0e564 # v1.2.0
+        uses: dsanders11/json-schema-validate-action@79b2d95a446a0d786f7f244ae7764f8370ff3657 # v1.4.0
         with:
           schema: https://json.schemastore.org/prettierrc.json
           files: .prettierrc.json

README.md

@@ -194,7 +194,7 @@ To see all potential options for this command, run:
 $ e build --help
 ```
 
-Once you have the source, the next step is to build it with `e build [target]`.
+Once you have the source, the next step is to build it with `e build --target [target]`.
 Some of the build targets you may want to build include:
 
 | Target        | Description                                              |
@@ -248,6 +248,12 @@ For example, running `e d gn ls out/Testing | grep "//ui/views/"` produces somet
 
 You could then run `e build --target ui/views/examples:views_examples_with_content` to produce Chrome's `//ui/views` example executable and run it with `./out/Testing/views_examples_with_content`.
 
+When first run, `e build` will try to set up reclient to speed up your builds. The permission prompt
+can look scary because GitHub's UI is less than optimal
+([related discussion](https://github.com/orgs/community/discussions/37117)). However, Electron only
+obtains user profile access and `read:org` permission. No permission is granted to any of your
+repositories or content.
+
 ## Using Electron
 
 After you've built Electron, it's time to use it!

evm-config.schema.json

@@ -29,19 +29,20 @@
       "type": "string",
       "minLength": 1
     },
-    "reclient": {
-      "description": "Whether to use the Electron RBE infrastructure",
+    "remoteBuild": {
+      "description": "Whether to use remote builds and what system to use",
       "type": "string",
       "enum": [
-        "remote_exec",
+        "reclient",
+        "siso",
         "none"
       ]
     },
-    "reclientHelperPath": {
+    "rbeHelperPath": {
       "description": "Path to alternative reclient credential helper",
       "type": "string"
     },
-    "reclientServiceAddress": {
+    "rbeServiceAddress": {
       "description": "Alternative RBE cluster address",
       "type": "string"
     },

example-configs/evm.base.yml

@@ -1,5 +1,5 @@
 root: /path/to/your/developer/folder
-reclient: remote_exec
+remoteBuild: reclient
 preserveSDK: 5
 remotes:
   electron:

example-configs/evm.chromium.yml

@@ -1,5 +1,5 @@
 root: /path/to/chromium/
-reclient: remote_exec
+remoteBuild: reclient
 defaultTarget: chrome
 execName: Chromium
 gen:

src/download.js

@@ -8,7 +8,21 @@ const { progressStream } = require('./utils/download');
 const write = fs.createWriteStream(process.argv[3]);
 
 async function tryDownload(attemptsLeft = 3) {
-  const response = await fetch(process.argv[2]);
+  const url = process.argv[2];
+  if (!url) {
+    return fatal('No URL provided for download');
+  }
+
+  const response = await fetch(url);
+
+  if (!response.ok) {
+    if (attemptsLeft === 0) {
+      return fatal(`Download failed - ${response.status} ${response.statusText}`);
+    }
+    console.log(`Download failed - trying ${attemptsLeft} more times`);
+    return tryDownload(attemptsLeft - 1);
+  }
+
   const total = parseInt(response.headers.get('content-length'), 10);
   const progress = progressStream(total, '[:bar] :mbRateMB/s :percent :etas');
 

src/e

@@ -95,6 +95,10 @@ program
   .action((args) => {
     try {
       const exec = evmConfig.execOf(evmConfig.current());
+      if (!fs.existsSync(exec)) {
+        fatal(`Could not find Electron executable at ${color.path(exec)}`);
+      }
+
       const opts = { stdio: 'inherit' };
       console.log(color.childExec(exec, args, opts));
       cp.execFileSync(exec, args, opts);
@@ -179,13 +183,18 @@ program
     'Opens a PR to electron/electron that backport the given CL into our patches folder',
   )
   .alias('auto-cherry-pick')
-  .command('gh-auth', 'Generates a device oauth token');
+  .command('gh-auth', 'Generates a device oauth token')
+  .command(
+    'rcv <roll-pr> [chromium-version]',
+    'Attempts to reconstruct an intermediate Chromium version from a roll PR',
+  )
+  .alias('reconstruct-chromium-version');
 
 program
-  .command('load-macos-sdk')
+  .command('load-macos-sdk [version]')
   .description('Loads required versions of macOS SDKs and symlinks them (may require sudo)')
-  .action(() => {
-    ensureSDK();
+  .action((version) => {
+    ensureSDK(version);
   });
 
 program

src/e-build.js

@@ -10,6 +10,7 @@ const { color, fatal } = require('./utils/logging');
 const depot = require('./utils/depot-tools');
 const { ensureDir } = require('./utils/paths');
 const reclient = require('./utils/reclient');
+const siso = require('./utils/siso');
 const { ensureSDK, ensureSDKAndSymlink } = require('./utils/sdk');
 
 function getGNArgs(config) {
@@ -42,7 +43,7 @@ function runGNGen(config) {
   fs.writeFileSync(argsFile, gnArgs, { encoding: 'utf8' });
   const execArgs = ['gen', `out/${config.gen.out}`];
   const execOpts = { cwd: path.resolve(config.root, 'src') };
-  depot.execFileSync(config, gnPath, execArgs, execOpts);
+  depot.spawnSync(config, gnPath, execArgs, execOpts);
 }
 
 function ensureGNGen(config) {
@@ -58,13 +59,21 @@ function ensureGNGen(config) {
 }
 
 function runNinja(config, target, ninjaArgs) {
-  if (reclient.usingRemote && config.reclient !== 'none') {
+  if (reclient.usingRemote && config.remoteBuild !== 'none') {
     reclient.auth(config);
 
     // Autoninja sets this absurdly high, we take it down a notch
-    if (!ninjaArgs.includes('-j') && !ninjaArgs.find((arg) => /^-j[0-9]+$/.test(arg.trim()))) {
+    if (
+      !ninjaArgs.includes('-j') &&
+      !ninjaArgs.find((arg) => /^-j[0-9]+$/.test(arg.trim())) &&
+      config.remoteBuild === 'reclient'
+    ) {
       ninjaArgs.push('-j', 200);
     }
+
+    if (config.remoteBuild === 'siso') {
+      ninjaArgs.push(...siso.flags(config));
+    }
   } else {
     console.info(`${color.info} Building ${target} with remote execution disabled`);
   }
@@ -84,7 +93,7 @@ function runNinja(config, target, ninjaArgs) {
   if (!reclient.usingRemote && config.reclient !== 'none') {
     opts.env = { RBE_remote_disabled: true };
   }
-  depot.execFileSync(config, exec, args, opts);
+  depot.spawnSync(config, exec, args, opts);
 }
 
 program
@@ -94,7 +103,7 @@ program
   .option('-t|--target [target]', 'Build a specific ninja target')
   .option('--no-remote', 'Build without remote execution (entirely locally)')
   .allowUnknownOption()
-  .action((ninjaArgs, options) => {
+  .action(async (ninjaArgs, options) => {
     try {
       const config = evmConfig.current();
 
@@ -109,7 +118,8 @@ program
         );
       }
 
-      reclient.downloadAndPrepare(config);
+      reclient.downloadAndPrepareRBECredentialHelper(config);
+      await siso.ensureBackendStarlark(config);
 
       if (process.platform === 'darwin') {
         ensureSDK();