2018-11-06 20:06:11 +00:00
|
|
|
#!/usr/bin/env node
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
'use strict';
|
|
|
|
|
2023-06-22 14:21:42 +00:00
|
|
|
const fs = require('node:fs');
|
|
|
|
const path = require('node:path');
|
2018-11-06 20:06:11 +00:00
|
|
|
|
|
|
|
const { GitProcess } = require('dugite');
|
2020-09-03 19:42:48 +00:00
|
|
|
|
2020-08-05 15:59:52 +00:00
|
|
|
const { Octokit } = require('@octokit/rest');
|
|
|
|
const octokit = new Octokit({
|
2019-05-08 01:48:40 +00:00
|
|
|
auth: process.env.ELECTRON_GITHUB_TOKEN
|
|
|
|
});
|
2018-11-06 20:06:11 +00:00
|
|
|
|
2020-08-10 23:56:54 +00:00
|
|
|
const { ELECTRON_DIR } = require('../../lib/utils');
|
2019-06-24 17:18:04 +00:00
|
|
|
|
2019-05-02 22:08:45 +00:00
|
|
|
const MAX_FAIL_COUNT = 3;
|
|
|
|
const CHECK_INTERVAL = 5000;
|
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
const TROP_LOGIN = 'trop[bot]';
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
const NO_NOTES = 'No notes';
|
2019-01-09 00:20:54 +00:00
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
const docTypes = new Set(['doc', 'docs']);
|
|
|
|
const featTypes = new Set(['feat', 'feature']);
|
|
|
|
const fixTypes = new Set(['fix']);
|
2021-04-28 07:38:08 +00:00
|
|
|
const otherTypes = new Set(['spec', 'build', 'test', 'chore', 'deps', 'refactor', 'tools', 'perf', 'style', 'ci']);
|
2020-05-01 00:00:59 +00:00
|
|
|
const knownTypes = new Set([...docTypes.keys(), ...featTypes.keys(), ...fixTypes.keys(), ...otherTypes.keys()]);
|
|
|
|
|
2020-06-08 18:39:44 +00:00
|
|
|
const getCacheDir = () => process.env.NOTES_CACHE_PATH || path.resolve(__dirname, '.cache');
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
/**
|
|
|
|
***
|
|
|
|
**/
|
|
|
|
|
|
|
|
// link to a GitHub item, e.g. an issue or pull request
|
|
|
|
class GHKey {
|
|
|
|
constructor (owner, repo, number) {
|
|
|
|
this.owner = owner;
|
|
|
|
this.repo = repo;
|
|
|
|
this.number = number;
|
|
|
|
}
|
2020-07-09 17:18:49 +00:00
|
|
|
|
2020-05-14 23:50:39 +00:00
|
|
|
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);
|
|
|
|
}
|
2020-05-01 00:00:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
class Commit {
|
|
|
|
constructor (hash, owner, repo) {
|
|
|
|
this.hash = hash; // string
|
|
|
|
this.owner = owner; // string
|
|
|
|
this.repo = repo; // string
|
|
|
|
|
|
|
|
this.isBreakingChange = false;
|
|
|
|
this.note = null; // string
|
2020-07-27 15:01:41 +00:00
|
|
|
|
|
|
|
// A set of branches to which this change has been merged.
|
|
|
|
// '8-x-y' => GHKey { owner: 'electron', repo: 'electron', number: 23714 }
|
|
|
|
this.trops = new Map(); // Map<string,GHKey>
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
this.prKeys = new Set(); // GHKey
|
|
|
|
this.revertHash = null; // string
|
|
|
|
this.semanticType = null; // string
|
|
|
|
this.subject = null; // string
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class Pool {
|
|
|
|
constructor () {
|
|
|
|
this.commits = []; // Array<Commit>
|
|
|
|
this.processedHashes = new Set();
|
|
|
|
this.pulls = {}; // GHKey.number => octokit pull object
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
***
|
|
|
|
**/
|
2018-11-06 20:06:11 +00:00
|
|
|
|
|
|
|
const runGit = async (dir, args) => {
|
|
|
|
const response = await GitProcess.exec(args, dir);
|
|
|
|
if (response.exitCode !== 0) {
|
|
|
|
throw new Error(response.stderr.trim());
|
|
|
|
}
|
|
|
|
return response.stdout.trim();
|
|
|
|
};
|
|
|
|
|
|
|
|
const getCommonAncestor = async (dir, point1, point2) => {
|
|
|
|
return runGit(dir, ['merge-base', point1, point2]);
|
|
|
|
};
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
const getNoteFromClerk = async (ghKey) => {
|
|
|
|
const comments = await getComments(ghKey);
|
2019-02-04 22:57:38 +00:00
|
|
|
if (!comments || !comments.data) return;
|
2019-02-01 16:31:03 +00:00
|
|
|
|
|
|
|
const CLERK_LOGIN = 'release-clerk[bot]';
|
2019-02-12 14:21:20 +00:00
|
|
|
const CLERK_NO_NOTES = '**No Release Notes**';
|
2019-02-01 16:31:03 +00:00
|
|
|
const PERSIST_LEAD = '**Release Notes Persisted**\n\n';
|
|
|
|
const QUOTE_LEAD = '> ';
|
|
|
|
|
|
|
|
for (const comment of comments.data.reverse()) {
|
|
|
|
if (comment.user.login !== CLERK_LOGIN) {
|
|
|
|
continue;
|
|
|
|
}
|
2019-02-12 14:21:20 +00:00
|
|
|
if (comment.body === CLERK_NO_NOTES) {
|
|
|
|
return NO_NOTES;
|
|
|
|
}
|
|
|
|
if (comment.body.startsWith(PERSIST_LEAD)) {
|
2020-09-03 19:42:48 +00:00
|
|
|
let lines = comment.body
|
2019-02-12 14:21:20 +00:00
|
|
|
.slice(PERSIST_LEAD.length).trim() // remove PERSIST_LEAD
|
2020-07-27 15:01:41 +00:00
|
|
|
.split(/\r?\n/) // split into lines
|
2019-02-12 14:21:20 +00:00
|
|
|
.map(line => line.trim())
|
2021-11-10 01:06:59 +00:00
|
|
|
.map(line => line.replace('<', '<'))
|
|
|
|
.map(line => line.replace('>', '>'))
|
2019-02-12 14:21:20 +00:00
|
|
|
.filter(line => line.startsWith(QUOTE_LEAD)) // notes are quoted
|
2020-09-03 19:42:48 +00:00
|
|
|
.map(line => line.slice(QUOTE_LEAD.length)); // unquote the lines
|
|
|
|
|
|
|
|
const firstLine = lines.shift();
|
|
|
|
// indent anything after the first line to ensure that
|
|
|
|
// multiline notes with their own sub-lists don't get
|
|
|
|
// parsed in the markdown as part of the top-level list
|
|
|
|
// (example: https://github.com/electron/electron/pull/25216)
|
|
|
|
lines = lines.map(line => ' ' + line);
|
|
|
|
return [firstLine, ...lines]
|
|
|
|
.join('\n') // join the lines
|
2019-02-12 14:21:20 +00:00
|
|
|
.trim();
|
2019-02-01 16:31:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
/**
|
|
|
|
* Looks for our project's conventions in the commit message:
|
|
|
|
*
|
2020-05-01 00:00:59 +00:00
|
|
|
* 'semantic: some description' -- sets semanticType, subject
|
2018-11-06 20:06:11 +00:00
|
|
|
* 'some description (#99999)' -- sets subject, pr
|
|
|
|
* 'Merge pull request #99999 from ${branchname}' -- sets pr
|
|
|
|
* 'This reverts commit ${sha}' -- sets revertHash
|
2020-05-01 00:00:59 +00:00
|
|
|
* line starting with 'BREAKING CHANGE' in body -- sets isBreakingChange
|
2018-11-06 20:06:11 +00:00
|
|
|
* 'Backport of #99999' -- sets pr
|
|
|
|
*/
|
2020-05-01 00:00:59 +00:00
|
|
|
const parseCommitMessage = (commitMessage, commit) => {
|
|
|
|
const { owner, repo } = commit;
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
// split commitMessage into subject & body
|
|
|
|
let subject = commitMessage;
|
|
|
|
let body = '';
|
|
|
|
const pos = subject.indexOf('\n');
|
|
|
|
if (pos !== -1) {
|
|
|
|
body = subject.slice(pos).trim();
|
|
|
|
subject = subject.slice(0, pos).trim();
|
|
|
|
}
|
|
|
|
|
|
|
|
// if the subject ends in ' (#dddd)', treat it as a pull request id
|
|
|
|
let match;
|
|
|
|
if ((match = subject.match(/^(.*)\s\(#(\d+)\)$/))) {
|
2020-05-01 00:00:59 +00:00
|
|
|
commit.prKeys.add(new GHKey(owner, repo, parseInt(match[2])));
|
2018-11-06 20:06:11 +00:00
|
|
|
subject = match[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
// if the subject begins with 'word:', treat it as a semantic commit
|
|
|
|
if ((match = subject.match(/^(\w+):\s(.*)$/))) {
|
2020-05-01 00:00:59 +00:00
|
|
|
const semanticType = match[1].toLocaleLowerCase();
|
|
|
|
if (knownTypes.has(semanticType)) {
|
|
|
|
commit.semanticType = semanticType;
|
2019-01-10 20:01:38 +00:00
|
|
|
subject = match[2];
|
|
|
|
}
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check for GitHub commit message that indicates a PR
|
|
|
|
if ((match = subject.match(/^Merge pull request #(\d+) from (.*)$/))) {
|
2020-05-01 00:00:59 +00:00
|
|
|
commit.prKeys.add(new GHKey(owner, repo, parseInt(match[1])));
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
// Check for a comment that indicates a PR
|
|
|
|
const backportPattern = /(?:^|\n)(?:manual |manually )?backport.*(?:#(\d+)|\/pull\/(\d+))/im;
|
|
|
|
if ((match = commitMessage.match(backportPattern))) {
|
|
|
|
// This might be the first or second capture group depending on if it's a link or not.
|
|
|
|
const backportNumber = match[1] ? parseInt(match[1], 10) : parseInt(match[2], 10);
|
|
|
|
commit.prKeys.add(new GHKey(owner, repo, backportNumber));
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// https://help.github.com/articles/closing-issues-using-keywords/
|
2020-09-23 20:21:34 +00:00
|
|
|
if (body.match(/\b(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved|for)\s#(\d+)\b/i)) {
|
2020-05-01 00:00:59 +00:00
|
|
|
commit.semanticType = commit.semanticType || 'fix';
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// https://www.conventionalcommits.org/en
|
|
|
|
if (commitMessage
|
2019-02-01 16:31:03 +00:00
|
|
|
.split(/\r?\n/) // split into lines
|
|
|
|
.map(line => line.trim())
|
|
|
|
.some(line => line.startsWith('BREAKING CHANGE'))) {
|
2020-05-01 00:00:59 +00:00
|
|
|
commit.isBreakingChange = true;
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check for a reversion commit
|
|
|
|
if ((match = body.match(/This reverts commit ([a-f0-9]{40})\./))) {
|
|
|
|
commit.revertHash = match[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
commit.subject = subject.trim();
|
|
|
|
return commit;
|
|
|
|
};
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
const parsePullText = (pull, commit) => parseCommitMessage(`${pull.data.title}\n\n${pull.data.body}`, commit);
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
const getLocalCommitHashes = async (dir, ref) => {
|
2020-06-08 18:39:44 +00:00
|
|
|
const args = ['log', '--format=%H', ref];
|
2020-07-27 15:01:41 +00:00
|
|
|
return (await runGit(dir, args))
|
|
|
|
.split(/\r?\n/) // split into lines
|
|
|
|
.map(hash => hash.trim());
|
2018-11-06 20:06:11 +00:00
|
|
|
};
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
// return an array of Commits
|
|
|
|
const getLocalCommits = async (module, point1, point2) => {
|
2018-11-06 20:06:11 +00:00
|
|
|
const { owner, repo, dir } = module;
|
|
|
|
|
2020-06-08 18:39:44 +00:00
|
|
|
const fieldSep = ',';
|
|
|
|
const format = ['%H', '%s'].join(fieldSep);
|
|
|
|
const args = ['log', '--cherry-pick', '--right-only', '--first-parent', `--format=${format}`, `${point1}..${point2}`];
|
2020-07-27 15:01:41 +00:00
|
|
|
const logs = (await runGit(dir, args))
|
|
|
|
.split(/\r?\n/) // split into lines
|
|
|
|
.map(field => field.trim());
|
2020-05-01 00:00:59 +00:00
|
|
|
|
|
|
|
const commits = [];
|
|
|
|
for (const log of logs) {
|
|
|
|
if (!log) {
|
2018-11-06 20:06:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2020-06-08 18:39:44 +00:00
|
|
|
const [hash, subject] = log.split(fieldSep, 2).map(field => field.trim());
|
|
|
|
commits.push(parseCommitMessage(subject, new Commit(hash, owner, repo)));
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
2020-05-01 00:00:59 +00:00
|
|
|
return commits;
|
2018-11-06 20:06:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
const checkCache = async (name, operation) => {
|
2020-06-08 18:39:44 +00:00
|
|
|
const filename = path.resolve(getCacheDir(), name);
|
2018-11-06 20:06:11 +00:00
|
|
|
if (fs.existsSync(filename)) {
|
|
|
|
return JSON.parse(fs.readFileSync(filename, 'utf8'));
|
|
|
|
}
|
2020-05-01 00:00:59 +00:00
|
|
|
process.stdout.write('.');
|
2018-11-06 20:06:11 +00:00
|
|
|
const response = await operation();
|
|
|
|
if (response) {
|
|
|
|
fs.writeFileSync(filename, JSON.stringify(response));
|
|
|
|
}
|
|
|
|
return response;
|
|
|
|
};
|
|
|
|
|
2019-05-02 22:08:45 +00:00
|
|
|
// helper function to add some resiliency to volatile GH api endpoints
|
|
|
|
async function runRetryable (fn, maxRetries) {
|
|
|
|
let lastError;
|
|
|
|
for (let i = 0; i < maxRetries; i++) {
|
2018-11-06 20:06:11 +00:00
|
|
|
try {
|
2019-05-02 22:08:45 +00:00
|
|
|
return await fn();
|
2018-11-06 20:06:11 +00:00
|
|
|
} catch (error) {
|
2023-06-26 09:51:54 +00:00
|
|
|
await new Promise(resolve => setTimeout(resolve, CHECK_INTERVAL));
|
2019-05-02 22:08:45 +00:00
|
|
|
lastError = error;
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
2019-05-02 22:08:45 +00:00
|
|
|
}
|
|
|
|
// Silently eat 404s.
|
2020-06-08 18:39:44 +00:00
|
|
|
// Silently eat 422s, which come from "No commit found for SHA"
|
|
|
|
if (lastError.status !== 404 && lastError.status !== 422) throw lastError;
|
2019-05-02 22:08:45 +00:00
|
|
|
}
|
|
|
|
|
2020-05-14 23:50:39 +00:00
|
|
|
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 });
|
2020-06-08 18:39:44 +00:00
|
|
|
let ret = await checkCache(name, () => runRetryable(retryableFunc, MAX_FAIL_COUNT));
|
2020-05-14 23:50:39 +00:00
|
|
|
|
|
|
|
// 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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-08 18:39:44 +00:00
|
|
|
// ensure the return value has the expected structure, even on failure
|
|
|
|
if (!ret || !ret.data) {
|
|
|
|
ret = { data: [] };
|
|
|
|
}
|
|
|
|
|
2020-05-14 23:50:39 +00:00
|
|
|
return ret;
|
|
|
|
};
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
const getPullRequest = async (ghKey) => {
|
|
|
|
const { number, owner, repo } = ghKey;
|
2020-05-14 23:50:39 +00:00
|
|
|
const name = getPullCacheFilename(ghKey);
|
2019-07-24 17:23:40 +00:00
|
|
|
const retryableFunc = () => octokit.pulls.get({ pull_number: number, owner, repo });
|
|
|
|
return checkCache(name, () => runRetryable(retryableFunc, MAX_FAIL_COUNT));
|
2018-11-06 20:06:11 +00:00
|
|
|
};
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
const getComments = async (ghKey) => {
|
|
|
|
const { number, owner, repo } = ghKey;
|
2019-07-24 17:23:40 +00:00
|
|
|
const name = `${owner}-${repo}-issue-${number}-comments`;
|
|
|
|
const retryableFunc = () => octokit.issues.listComments({ issue_number: number, owner, repo, per_page: 100 });
|
|
|
|
return checkCache(name, () => runRetryable(retryableFunc, MAX_FAIL_COUNT));
|
2019-02-01 16:31:03 +00:00
|
|
|
};
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
const addRepoToPool = async (pool, repo, from, to) => {
|
|
|
|
const commonAncestor = await getCommonAncestor(repo.dir, from, to);
|
2020-05-01 00:00:59 +00:00
|
|
|
|
2020-05-14 23:50:39 +00:00
|
|
|
// 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
|
2020-05-01 00:00:59 +00:00
|
|
|
const commits = await getLocalCommits(repo, commonAncestor, to);
|
2020-05-14 23:50:39 +00:00
|
|
|
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));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
pool.commits.push(...commits);
|
2020-05-01 00:00:59 +00:00
|
|
|
|
|
|
|
// add the pulls
|
|
|
|
for (const commit of commits) {
|
|
|
|
let prKey;
|
|
|
|
for (prKey of commit.prKeys.values()) {
|
|
|
|
const pull = await getPullRequest(prKey);
|
2020-05-14 23:50:39 +00:00
|
|
|
if (!pull || !pull.data) continue; // couldn't get it
|
2020-05-01 00:00:59 +00:00
|
|
|
pool.pulls[prKey.number] = pull;
|
|
|
|
parsePullText(pull, commit);
|
|
|
|
}
|
|
|
|
}
|
2018-11-06 20:06:11 +00:00
|
|
|
};
|
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
// @return Map<string,GHKey>
|
|
|
|
// where the key is a branch name (e.g. '7-1-x' or '8-x-y')
|
|
|
|
// and the value is a GHKey to the PR
|
|
|
|
async function getMergedTrops (commit, pool) {
|
|
|
|
const branches = new Map();
|
|
|
|
|
|
|
|
for (const prKey of commit.prKeys.values()) {
|
|
|
|
const pull = pool.pulls[prKey.number];
|
|
|
|
const mergedBranches = new Set(
|
|
|
|
((pull && pull.data && pull.data.labels) ? pull.data.labels : [])
|
|
|
|
.map(label => ((label && label.name) ? label.name : '').match(/merged\/([0-9]+-[x0-9]-[xy0-9])/))
|
|
|
|
.filter(match => match)
|
|
|
|
.map(match => match[1])
|
|
|
|
);
|
|
|
|
|
|
|
|
if (mergedBranches.size > 0) {
|
|
|
|
const isTropComment = (comment) => comment && comment.user && comment.user.login === TROP_LOGIN;
|
|
|
|
|
|
|
|
const ghKey = GHKey.NewFromPull(pull.data);
|
|
|
|
const backportRegex = /backported this PR to "(.*)",\s+please check out #(\d+)/;
|
|
|
|
const getBranchNameAndPullKey = (comment) => {
|
|
|
|
const match = ((comment && comment.body) ? comment.body : '').match(backportRegex);
|
|
|
|
return match ? [match[1], new GHKey(ghKey.owner, ghKey.repo, parseInt(match[2]))] : null;
|
|
|
|
};
|
|
|
|
|
|
|
|
const comments = await getComments(ghKey);
|
|
|
|
((comments && comments.data) ? comments.data : [])
|
|
|
|
.filter(isTropComment)
|
|
|
|
.map(getBranchNameAndPullKey)
|
|
|
|
.filter(pair => pair)
|
|
|
|
.filter(([branch]) => mergedBranches.has(branch))
|
|
|
|
.forEach(([branch, key]) => branches.set(branch, key));
|
|
|
|
}
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
2020-05-01 00:00:59 +00:00
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
return branches;
|
2020-07-21 16:38:28 +00:00
|
|
|
}
|
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
// @return the shorthand name of the branch that `ref` is on,
|
|
|
|
// e.g. a ref of '10.0.0-beta.1' will return '10-x-y'
|
|
|
|
async function getBranchNameOfRef (ref, dir) {
|
|
|
|
return (await runGit(dir, ['branch', '--all', '--contains', ref, '--sort', 'version:refname']))
|
|
|
|
.split(/\r?\n/) // split into lines
|
|
|
|
.shift() // we sorted by refname and want the first result
|
2020-10-19 18:36:37 +00:00
|
|
|
.match(/(?:\s?\*\s){0,1}(.*)/)[1] // if present, remove leading '* ' in case we're currently in that branch
|
2020-07-27 15:01:41 +00:00
|
|
|
.match(/(?:.*\/)?(.*)/)[1] // 'remote/origins/10-x-y' -> '10-x-y'
|
|
|
|
.trim();
|
2020-06-08 18:39:44 +00:00
|
|
|
}
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
/***
|
|
|
|
**** Main
|
|
|
|
***/
|
|
|
|
|
2019-01-10 20:01:38 +00:00
|
|
|
const getNotes = async (fromRef, toRef, newVersion) => {
|
2020-06-08 18:39:44 +00:00
|
|
|
const cacheDir = getCacheDir();
|
|
|
|
if (!fs.existsSync(cacheDir)) {
|
|
|
|
fs.mkdirSync(cacheDir);
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
const pool = new Pool();
|
2020-08-10 23:56:54 +00:00
|
|
|
const toBranch = await getBranchNameOfRef(toRef, ELECTRON_DIR);
|
2020-07-27 15:01:41 +00:00
|
|
|
|
2020-10-19 18:36:37 +00:00
|
|
|
console.log(`Generating release notes between '${fromRef}' and '${toRef}' for version '${newVersion}' in branch '${toBranch}'`);
|
2018-11-06 20:06:11 +00:00
|
|
|
|
|
|
|
// get the electron/electron commits
|
2020-08-10 23:56:54 +00:00
|
|
|
const electron = { owner: 'electron', repo: 'electron', dir: ELECTRON_DIR };
|
2018-11-06 20:06:11 +00:00
|
|
|
await addRepoToPool(pool, electron, fromRef, toRef);
|
|
|
|
|
|
|
|
// remove any old commits
|
|
|
|
pool.commits = pool.commits.filter(commit => !pool.processedHashes.has(commit.hash));
|
|
|
|
|
2022-06-16 07:46:11 +00:00
|
|
|
// if a commit _and_ revert occurred in the unprocessed set, skip them both
|
2018-11-06 20:06:11 +00:00
|
|
|
for (const commit of pool.commits) {
|
|
|
|
const revertHash = commit.revertHash;
|
|
|
|
if (!revertHash) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
const revert = pool.commits.find(commit => commit.hash === revertHash);
|
|
|
|
if (!revert) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
commit.note = NO_NOTES;
|
|
|
|
revert.note = NO_NOTES;
|
|
|
|
pool.processedHashes.add(commit.hash);
|
|
|
|
pool.processedHashes.add(revertHash);
|
|
|
|
}
|
|
|
|
|
2020-05-01 00:00:59 +00:00
|
|
|
// ensure the commit has a note
|
2018-11-06 20:06:11 +00:00
|
|
|
for (const commit of pool.commits) {
|
2020-05-01 00:00:59 +00:00
|
|
|
for (const prKey of commit.prKeys.values()) {
|
|
|
|
if (commit.note) {
|
2018-11-06 20:06:11 +00:00
|
|
|
break;
|
|
|
|
}
|
2020-06-08 18:39:44 +00:00
|
|
|
commit.note = await getNoteFromClerk(prKey);
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-10 20:01:38 +00:00
|
|
|
// remove non-user-facing commits
|
2018-11-06 20:06:11 +00:00
|
|
|
pool.commits = pool.commits
|
2020-07-27 15:01:41 +00:00
|
|
|
.filter(commit => commit && commit.note)
|
|
|
|
.filter(commit => commit.note !== NO_NOTES)
|
|
|
|
.filter(commit => commit.note.match(/^[Bb]ump v\d+\.\d+\.\d+/) === null);
|
2018-11-06 20:06:11 +00:00
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
for (const commit of pool.commits) {
|
|
|
|
commit.trops = await getMergedTrops(commit, pool);
|
2019-01-10 20:01:38 +00:00
|
|
|
}
|
|
|
|
|
2020-06-08 18:39:44 +00:00
|
|
|
pool.commits = removeSupercededStackUpdates(pool.commits);
|
2019-07-23 20:50:18 +00:00
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
const notes = {
|
2019-01-10 20:01:38 +00:00
|
|
|
breaking: [],
|
2018-11-06 20:06:11 +00:00
|
|
|
docs: [],
|
|
|
|
feat: [],
|
|
|
|
fix: [],
|
|
|
|
other: [],
|
|
|
|
unknown: [],
|
2020-07-27 15:01:41 +00:00
|
|
|
name: newVersion,
|
|
|
|
toBranch
|
2018-11-06 20:06:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
pool.commits.forEach(commit => {
|
2020-05-01 00:00:59 +00:00
|
|
|
const str = commit.semanticType;
|
|
|
|
if (commit.isBreakingChange) {
|
2019-01-10 20:01:38 +00:00
|
|
|
notes.breaking.push(commit);
|
2020-05-01 00:00:59 +00:00
|
|
|
} else if (!str) {
|
|
|
|
notes.unknown.push(commit);
|
2018-11-06 20:06:11 +00:00
|
|
|
} else if (docTypes.has(str)) {
|
|
|
|
notes.docs.push(commit);
|
|
|
|
} else if (featTypes.has(str)) {
|
|
|
|
notes.feat.push(commit);
|
|
|
|
} else if (fixTypes.has(str)) {
|
|
|
|
notes.fix.push(commit);
|
|
|
|
} else if (otherTypes.has(str)) {
|
|
|
|
notes.other.push(commit);
|
|
|
|
} else {
|
|
|
|
notes.unknown.push(commit);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
return notes;
|
|
|
|
};
|
|
|
|
|
2020-06-08 18:39:44 +00:00
|
|
|
const removeSupercededStackUpdates = (commits) => {
|
|
|
|
const updateRegex = /^Updated ([a-zA-Z.]+) to v?([\d.]+)/;
|
|
|
|
const notupdates = [];
|
2019-07-23 20:50:18 +00:00
|
|
|
|
2020-06-08 18:39:44 +00:00
|
|
|
const newest = {};
|
|
|
|
for (const commit of commits) {
|
|
|
|
const match = (commit.note || commit.subject).match(updateRegex);
|
|
|
|
if (!match) {
|
|
|
|
notupdates.push(commit);
|
|
|
|
continue;
|
|
|
|
}
|
2020-07-09 17:18:49 +00:00
|
|
|
const [, dep, version] = match;
|
2020-06-08 18:39:44 +00:00
|
|
|
if (!newest[dep] || newest[dep].version < version) {
|
|
|
|
newest[dep] = { commit, version };
|
|
|
|
}
|
2019-07-23 20:50:18 +00:00
|
|
|
}
|
|
|
|
|
2020-07-09 17:18:49 +00:00
|
|
|
return [...notupdates, ...Object.values(newest).map(o => o.commit)];
|
2019-07-23 20:50:18 +00:00
|
|
|
};
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
/***
|
|
|
|
**** Render
|
|
|
|
***/
|
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
// @return the pull request's GitHub URL
|
|
|
|
const buildPullURL = ghKey => `https://github.com/${ghKey.owner}/${ghKey.repo}/pull/${ghKey.number}`;
|
|
|
|
|
|
|
|
const renderPull = ghKey => `[#${ghKey.number}](${buildPullURL(ghKey)})`;
|
2020-07-21 15:32:36 +00:00
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
// @return the commit's GitHub URL
|
|
|
|
const buildCommitURL = commit => `https://github.com/${commit.owner}/${commit.repo}/commit/${commit.hash}`;
|
|
|
|
|
|
|
|
const renderCommit = commit => `[${commit.hash.slice(0, 8)}](${buildCommitURL(commit)})`;
|
|
|
|
|
|
|
|
// @return a markdown link to the PR if available; otherwise, the git commit
|
|
|
|
function renderLink (commit) {
|
|
|
|
const maybePull = commit.prKeys.values().next();
|
|
|
|
return maybePull.value ? renderPull(maybePull.value) : renderCommit(commit);
|
|
|
|
}
|
|
|
|
|
|
|
|
// @return a terser branch name,
|
|
|
|
// e.g. '7-2-x' -> '7.2' and '8-x-y' -> '8'
|
|
|
|
const renderBranchName = name => name.replace(/-[a-zA-Z]/g, '').replace('-', '.');
|
|
|
|
|
|
|
|
const renderTrop = (branch, ghKey) => `[${renderBranchName(branch)}](${buildPullURL(ghKey)})`;
|
|
|
|
|
|
|
|
// @return markdown-formatted links to other branches' trops,
|
|
|
|
// e.g. "(Also in 7.2, 8, 9)"
|
|
|
|
function renderTrops (commit, excludeBranch) {
|
|
|
|
const body = [...commit.trops.entries()]
|
|
|
|
.filter(([branch]) => branch !== excludeBranch)
|
|
|
|
.sort(([branchA], [branchB]) => parseInt(branchA) - parseInt(branchB)) // sort by semver major
|
|
|
|
.map(([branch, key]) => renderTrop(branch, key))
|
|
|
|
.join(', ');
|
|
|
|
return body ? `<span style="font-size:small;">(Also in ${body})</span>` : body;
|
|
|
|
}
|
|
|
|
|
|
|
|
// @return a slightly cleaned-up human-readable change description
|
|
|
|
function renderDescription (commit) {
|
|
|
|
let note = commit.note || commit.subject || '';
|
2018-11-06 20:06:11 +00:00
|
|
|
note = note.trim();
|
2020-09-03 19:42:48 +00:00
|
|
|
|
|
|
|
// release notes bullet point every change, so if the note author
|
|
|
|
// manually started the content with a bullet point, that will confuse
|
|
|
|
// the markdown renderer -- remove the redundant bullet point
|
|
|
|
// (example: https://github.com/electron/electron/pull/25216)
|
|
|
|
if (note.startsWith('*')) {
|
|
|
|
note = note.slice(1).trim();
|
|
|
|
}
|
|
|
|
|
2018-11-06 20:06:11 +00:00
|
|
|
if (note.length !== 0) {
|
|
|
|
note = note[0].toUpperCase() + note.substr(1);
|
|
|
|
|
|
|
|
if (!note.endsWith('.')) {
|
|
|
|
note = note + '.';
|
|
|
|
}
|
|
|
|
|
|
|
|
const commonVerbs = {
|
2020-03-20 15:12:18 +00:00
|
|
|
Added: ['Add'],
|
|
|
|
Backported: ['Backport'],
|
|
|
|
Cleaned: ['Clean'],
|
|
|
|
Disabled: ['Disable'],
|
|
|
|
Ensured: ['Ensure'],
|
|
|
|
Exported: ['Export'],
|
|
|
|
Fixed: ['Fix', 'Fixes'],
|
|
|
|
Handled: ['Handle'],
|
|
|
|
Improved: ['Improve'],
|
|
|
|
Made: ['Make'],
|
|
|
|
Removed: ['Remove'],
|
|
|
|
Repaired: ['Repair'],
|
|
|
|
Reverted: ['Revert'],
|
|
|
|
Stopped: ['Stop'],
|
|
|
|
Updated: ['Update'],
|
|
|
|
Upgraded: ['Upgrade']
|
2018-11-06 20:06:11 +00:00
|
|
|
};
|
|
|
|
for (const [key, values] of Object.entries(commonVerbs)) {
|
|
|
|
for (const value of values) {
|
|
|
|
const start = `${value} `;
|
|
|
|
if (note.startsWith(start)) {
|
|
|
|
note = `${key} ${note.slice(start.length)}`;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
return note;
|
|
|
|
}
|
2018-11-06 20:06:11 +00:00
|
|
|
|
2020-07-27 15:01:41 +00:00
|
|
|
// @return markdown-formatted release note line item,
|
|
|
|
// e.g. '* Fixed a foo. #12345 (Also in 7.2, 8, 9)'
|
|
|
|
const renderNote = (commit, excludeBranch) =>
|
|
|
|
`* ${renderDescription(commit)} ${renderLink(commit)} ${renderTrops(commit, excludeBranch)}\n`;
|
2018-11-06 20:06:11 +00:00
|
|
|
|
2022-06-06 05:51:10 +00:00
|
|
|
const renderNotes = (notes, unique = false) => {
|
2020-03-20 15:12:18 +00:00
|
|
|
const rendered = [`# Release Notes for ${notes.name}\n\n`];
|
2018-11-06 20:06:11 +00:00
|
|
|
|
2022-06-06 05:51:10 +00:00
|
|
|
const renderSection = (title, commits, unique) => {
|
|
|
|
if (unique) {
|
|
|
|
// omit changes that also landed in other branches
|
|
|
|
commits = commits.filter((commit) => renderTrops(commit, notes.toBranch).length === 0);
|
|
|
|
}
|
2020-07-27 15:01:41 +00:00
|
|
|
if (commits.length > 0) {
|
|
|
|
rendered.push(
|
|
|
|
`## ${title}\n\n`,
|
|
|
|
...(commits.map(commit => renderNote(commit, notes.toBranch)).sort())
|
|
|
|
);
|
2018-11-06 20:06:11 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2022-06-06 05:51:10 +00:00
|
|
|
renderSection('Breaking Changes', notes.breaking, unique);
|
|
|
|
renderSection('Features', notes.feat, unique);
|
|
|
|
renderSection('Fixes', notes.fix, unique);
|
|
|
|
renderSection('Other Changes', notes.other, unique);
|
2018-11-06 20:06:11 +00:00
|
|
|
|
|
|
|
if (notes.docs.length) {
|
2020-07-27 15:01:41 +00:00
|
|
|
const docs = notes.docs.map(commit => renderLink(commit)).sort();
|
2018-11-06 20:06:11 +00:00
|
|
|
rendered.push('## Documentation\n\n', ` * Documentation changes: ${docs.join(', ')}\n`, '\n');
|
|
|
|
}
|
|
|
|
|
2022-06-06 05:51:10 +00:00
|
|
|
renderSection('Unknown', notes.unknown, unique);
|
2018-11-06 20:06:11 +00:00
|
|
|
|
|
|
|
return rendered.join('');
|
|
|
|
};
|
|
|
|
|
|
|
|
/***
|
|
|
|
**** Module
|
|
|
|
***/
|
|
|
|
|
|
|
|
module.exports = {
|
|
|
|
get: getNotes,
|
|
|
|
render: renderNotes
|
|
|
|
};
|