hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

fix: create-release-tool should correctly determine the milestone from the base branch

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-05-29 09:08:09 -04:00
parent a22229ba60
commit 7535f73f00
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/release-tool/src/index.ts
View File

@ -156,8 +156,8 @@ function formatSemverForMilestone(version: SemVer): string {
return `${version.major}.${version.minor}.${version.patch}`; return `${version.major}.${version.minor}.${version.patch}`;
} }
function formatVersionForPickingPrs(version: SemVer): string { function formatVersionForPickingPrs(version: SemVer, isMasterBranch: boolean): string {
return `${version.major}.${version.minor}.${version.patch}`; return `${version.major}.${version.minor}.${version.patch + (isMasterBranch ? 0 : 1)}`;
} }
async function deleteAndClosePreviousReleaseBranch(prBase: string, prBranch: string) { async function deleteAndClosePreviousReleaseBranch(prBase: string, prBranch: string) {
@ -276,10 +276,10 @@ function sortExtendedGithubPrData(left: ExtendedGithubPrData, right: ExtendedGit
return -1; return -1;
} }
async function getRelevantPRs(previousReleasedVersion: string, baseBranch: string): Promise<ExtendedGithubPrData[]> { async function getRelevantPRs(previousReleasedVersion: string, baseBranch: string, isMasterBranch: boolean): Promise<ExtendedGithubPrData[]> {
console.log(`retrieving previous 200 PRs from ${baseBranch}...`); console.log(`retrieving previous 200 PRs from ${baseBranch}...`);
const milestone = formatVersionForPickingPrs(await getCurrentVersionOfSubPackage("core")); const milestone = formatVersionForPickingPrs(await getCurrentVersionOfSubPackage("core"), isMasterBranch);
const mergedPrsDataPromises = [1, 2, 3, 4, 5].map(page => octokit.request("GET /repos/{owner}/{repo}/pulls", { const mergedPrsDataPromises = [1, 2, 3, 4, 5].map(page => octokit.request("GET /repos/{owner}/{repo}/pulls", {
owner: "lensapp", owner: "lensapp",
repo: "lens", repo: "lens",
@ -486,11 +486,10 @@ async function createRelease(): Promise<void> {
await bumpPackageVersions(); await bumpPackageVersions();
} }
const relevantPrs = await getRelevantPRs(previousReleasedVersion, "master"); const relevantPrs = [
...await getRelevantPRs(previousReleasedVersion, "master", isMasterBranch),
if (prBase !== "master") { ...(prBase !== "master" ? await getRelevantPRs(previousReleasedVersion, prBase, isMasterBranch) : []),
relevantPrs.push(...await getRelevantPRs(previousReleasedVersion, prBase)); ];
}
const selectedPrs = await pickRelevantPrs(relevantPrs, isMasterBranch); const selectedPrs = await pickRelevantPrs(relevantPrs, isMasterBranch);