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

Add line describing what to do

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-02-24 13:31:35 -05:00
parent 123f852046
commit be2d19bbfb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import assert from "assert";
import child_process from "child_process"; import child_process from "child_process";
import { readFile } from "fs/promises"; import { readFile } from "fs/promises";
import inquirer from "inquirer"; import inquirer from "inquirer";
import { EOL } from "os";
import { createInterface, ReadLine } from "readline"; import { createInterface, ReadLine } from "readline";
import semver from "semver"; import semver from "semver";
import { promisify } from "util"; import { promisify } from "util";
@ -194,7 +195,6 @@ const cherrypickCommitWith = (rl: ReadLine) => async (commit: string) => {
stdio: "inherit", stdio: "inherit",
}); });
} catch { } catch {
console.error(`Please resolve conflicts and then press enter here...`);
await new Promise<void>(resolve => rl.once("line", () => resolve())); await new Promise<void>(resolve => rl.once("line", () => resolve()));
} }
}; };
@ -258,6 +258,7 @@ function formatChangelog(previousReleasedVersion: string, prs: ExtendedGithubPrD
} }
async function cherrypickCommits(prs: ExtendedGithubPrData[]): Promise<void> { async function cherrypickCommits(prs: ExtendedGithubPrData[]): Promise<void> {
console.log(`${EOL}If cherry-picking fails for any of these commits, please resolve them in a seperate terminal and then run "git cherry-pick --continue"${EOL}`);
const rl = createInterface(process.stdin); const rl = createInterface(process.stdin);
const cherrypickCommit = cherrypickCommitWith(rl); const cherrypickCommit = cherrypickCommitWith(rl);