Bump v10.0.0-beta.1

This reverts commit 2342aaffbd.

ELECTRON_VERSION

@@ -1 +1 @@
-10.0.0-nightly.20200521
+10.0.0-beta.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "10.0.0-nightly.20200521",
+  "version": "10.0.0-beta.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

script/release/notes/index.js

@@ -8,7 +8,7 @@ const semver = require('semver');
 const { ELECTRON_DIR } = require('../../lib/utils');
 const notesGenerator = require('./notes.js');
 
-const semverify = version => version.replace(/^origin\//, '').replace('x', '0').replace(/-/g, '.');
+const semverify = version => version.replace(/^origin\//, '').replace(/[xy]/g, '0').replace(/-/g, '.');
 
 const runGit = async (args) => {
   const response = await GitProcess.exec(args, ELECTRON_DIR);
@@ -60,7 +60,7 @@ const getAllBranches = async () => {
 
 const getStabilizationBranches = async () => {
   return (await getAllBranches())
-    .filter(branch => /^origin\/\d+-\d+-x$/.test(branch));
+    .filter(branch => /^origin\/\d+-\d+-x$/.test(branch) || /^origin\/\d+-x-y$/.test(branch));
 };
 
 const getPreviousStabilizationBranch = async (current) => {

script/release/notes/notes.js

@@ -39,12 +39,6 @@ class GHKey {
     this.repo = repo;
     this.number = number;
   }
-  static NewFromPull (pull) {
-    const owner = pull.base.repo.owner.login;
-    const repo = pull.base.repo.name;
-    const number = pull.number;
-    return new GHKey(owner, repo, number);
-  }
 }
 
 class Commit {
@@ -295,33 +289,9 @@ async function runRetryable (fn, maxRetries) {
   if (lastError.status !== 404) throw lastError;
 }
 
-const getPullCacheFilename = ghKey => `${ghKey.owner}-${ghKey.repo}-pull-${ghKey.number}`;
-
-const getCommitPulls = async (owner, repo, hash) => {
-  const name = `${owner}-${repo}-commit-${hash}`;
-  const retryableFunc = () => octokit.repos.listPullRequestsAssociatedWithCommit({ owner, repo, commit_sha: hash });
-  const ret = await checkCache(name, () => runRetryable(retryableFunc, MAX_FAIL_COUNT));
-
-  // only merged pulls belong in release notes
-  if (ret && ret.data) {
-    ret.data = ret.data.filter(pull => pull.merged_at);
-  }
-
-  // cache the pulls
-  if (ret && ret.data) {
-    for (const pull of ret.data) {
-      const cachefile = getPullCacheFilename(GHKey.NewFromPull(pull));
-      const payload = { ...ret, data: pull };
-      await checkCache(cachefile, () => payload);
-    }
-  }
-
-  return ret;
-};
-
 const getPullRequest = async (ghKey) => {
   const { number, owner, repo } = ghKey;
-  const name = getPullCacheFilename(ghKey);
+  const name = `${owner}-${repo}-pull-${number}`;
   const retryableFunc = () => octokit.pulls.get({ pull_number: number, owner, repo });
   return checkCache(name, () => runRetryable(retryableFunc, MAX_FAIL_COUNT));
 };
@@ -336,20 +306,10 @@ const getComments = async (ghKey) => {
 const addRepoToPool = async (pool, repo, from, to) => {
   const commonAncestor = await getCommonAncestor(repo.dir, from, to);
 
-  // mark the old branch's commits as old news
-  for (const oldHash of await getLocalCommitHashes(repo.dir, from)) {
-    pool.processedHashes.add(oldHash);
-  }
-
-  // get the new branch's commits and the pulls associated with them
+  // add the commits
+  const oldHashes = await getLocalCommitHashes(repo.dir, from);
+  oldHashes.forEach(hash => { pool.processedHashes.add(hash); });
   const commits = await getLocalCommits(repo, commonAncestor, to);
-  for (const commit of commits) {
-    const { owner, repo, hash } = commit;
-    for (const pull of (await getCommitPulls(owner, repo, hash)).data) {
-      commit.prKeys.add(GHKey.NewFromPull(pull));
-    }
-  }
-
   pool.commits.push(...commits);
 
   // add the pulls
@@ -357,7 +317,8 @@ const addRepoToPool = async (pool, repo, from, to) => {
     let prKey;
     for (prKey of commit.prKeys.values()) {
       const pull = await getPullRequest(prKey);
-      if (!pull || !pull.data) continue; // couldn't get it
+      if (!pull || !pull.data) break; // couldn't get it
+      if (pool.pulls[prKey.number]) break; // already have it
       pool.pulls[prKey.number] = pull;
       parsePullText(pull, commit);
     }

shell/browser/resources/win/electron.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 10,0,0,20200521
- PRODUCTVERSION 10,0,0,20200521
+ FILEVERSION 10,0,0,1
+ PRODUCTVERSION 10,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L