Various improvements to release-tool #7232

Nokel81 · 2023-02-23T17:53:47Z

Pass more IO from script to user to provide better UX
Interactive versioning using lerna directly
Remove all CMD args in favour of interactive

- Pass more IO from script to user to provide better UX - Interactive versioning using lerna directly - Remove all CMD args in favour of interactive Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>

jim-docker

~/git/lensStage/lensapp/lens$ npm run create-release-pr

> precreate-release-pr
> cd packages/release-tool && npm run build


> @k8slens/release-tool@6.4.0-beta.13 build
> swc ./src/index.ts -d ./dist

Successfully compiled: 1 file with swc (8.27ms)

> create-release-pr
> node packages/release-tool/dist/index.js

It looks like you are running this script from the 'scripts' directory. This script assumes it is run from the root of the git repo

> bump-version
> lerna version --no-git-tag-version --no-push

lerna notice cli v6.5.1
lerna info current version 6.4.0-beta.13
lerna notice FYI git repository validation has been skipped, please ensure your version bumps are correct
lerna info Looking for changed packages since v6.4.0-beta.13
lerna WARN version Skipping working tree validation, proceed at your own risk
? Select a new version (currently 6.4.0-beta.13) Custom Prerelease
? Enter a prerelease identifier (default: "beta", yielding 6.4.0-beta.14)

I ran this in the repo root but still got the warning about running from the scripts dir
Why does it say the current version is 6.4.0-beta.13? Aren't we on 15?

packages/release-tool/src/index.ts

Nokel81 · 2023-02-23T20:07:51Z

Will look into this
Master is currently still 6.4.0-beta.13

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Nokel81 · 2023-02-23T21:17:49Z

@jim-docker Fixed PTALA

packages/release-tool/src/index.ts

Signed-off-by: Sebastian Malton <sebastian@malton.name>

jim-docker

I'm confused as to what I should do next here:

~/git/lensStage/lensapp/lens$ npm run create-release-pr

> precreate-release-pr
> cd packages/release-tool && npm run build


> @k8slens/release-tool@6.4.0-beta.13 build
> swc ./src/index.ts -d ./dist

Successfully compiled: 1 file with swc (10.1ms)

> create-release-pr
> node packages/release-tool/dist/index.js

retreiving previous 500 PRs...
? Pick which commits to use... #7202: Fix: removed duplicated labels & annotations for Node-details view (https://github.com/lensapp/lens/pull/7202), #7188: Fix ensure hashed directory for extension (https://github.com/lensapp/lens/pull/7188), #7194: Bump @hapi/subtext 
from 7.0.4 to 7.1.0 (https://github.com/lensapp/lens/pull/7194), #7209: Fix dropdown items readability in Dock (https://github.com/lensapp/lens/pull/7209), #7210: Fix command line argument not being passed to lerna (https://github.com/lensapp/lens/pull/7210), #7212: Fix
 PodList TableHead overflow (https://github.com/lensapp/lens/pull/7212), #7215: Remove notarize as unused (https://github.com/lensapp/lens/pull/7215), #7226: Fix catalog avatar font size (https://github.com/lensapp/lens/pull/7226), #7235: Fix ApiManager not handling dup
licate apiBases of KubeApis (https://github.com/lensapp/lens/pull/7235), #7217: Allow extensions to opt-out of KubeApi auto registering (https://github.com/lensapp/lens/pull/7217)
On branch improve-release-tool
Your branch is up to date with 'origin/improve-release-tool'.

You are currently cherry-picking commit b3ae5a0446.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

packages/release-tool/src/index.ts

Nokel81 · 2023-02-24T18:21:26Z

I'm confused as to what I should do next here:

Good catch

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Nokel81 · 2023-02-24T18:48:54Z

It now looks like this

jim-docker

Have you tested end-to-end? I guess it's hard to test master before merging this PR since it runs on itself?

It's nice that options lists are provided, so user doesn't have to know a priori what's expected.

jim-docker · 2023-02-24T20:30:22Z

packages/release-tool/src/index.ts

    });
  } catch {
+    console.error(chalk.bold("Please resolve conflicts in a seperate terminal and then press enter here..."));


seperate => separate

jim-docker · 2023-02-24T20:40:45Z

packages/release-tool/src/index.ts

+  let selectedPrs: ExtendedGithubPrData[];
+
+  do {
+    selectedPrs = await pickWhichPRsToUse(prs);


user must now always check commits? (as if --check-commits is always set?)

Yes, technically, but it is easier now because the user can just press <enter> to select all of them.

Nokel81 · 2023-02-24T20:46:26Z

Have you tested end-to-end? I guess it's hard to test master before merging this PR since it runs on itself?

Not fully, but close I have

jim-docker · 2023-02-24T21:18:19Z

Have you tested end-to-end? I guess it's hard to test master before merging this PR since it runs on itself?

Not fully, but close I have

Do you want to merge and iron out any kinks on the first runs?

Nokel81 · 2023-02-24T21:39:04Z

Do you want to merge and iron out any kinks on the first runs?

That is what I was thinking yes

* Various improvements to release-tool - Pass more IO from script to user to provide better UX - Interactive versioning using lerna directly - Remove all CMD args in favour of interactive Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove some more unnecessary console logs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Resolve comments Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix repoRoot issue Signed-off-by: Sebastian Malton <sebastian@malton.name> * De-spagetti-ify release-tool Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix bugs related to picking PRs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix name Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve display after picking PRs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rename pickWhichPRsToUse Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add line describing what to do Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix not displaying output after cherry-pick fails Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> Co-authored-by: Roman <ixrock@gmail.com> Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Various improvements to release-tool (#7232) * Various improvements to release-tool - Pass more IO from script to user to provide better UX - Interactive versioning using lerna directly - Remove all CMD args in favour of interactive Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove some more unnecessary console logs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Resolve comments Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix repoRoot issue Signed-off-by: Sebastian Malton <sebastian@malton.name> * De-spagetti-ify release-tool Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix bugs related to picking PRs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix name Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve display after picking PRs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rename pickWhichPRsToUse Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add line describing what to do Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix not displaying output after cherry-pick fails Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> Co-authored-by: Roman <ixrock@gmail.com> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix ApiManager not handling duplicate apiBases of KubeApis (#7235) * Add failing unit test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix failing unit test Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> * Allow extensions to opt-out of KubeApi auto registering (#7217) Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove all references to slack (#7233) * Remove all references to slack Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix readme Signed-off-by: Sebastian Malton <sebastian@malton.name> * Cleanup migration Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove existing slack link from weblink store Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type error and wording on ErrorBoundary Signed-off-by: Sebastian Malton <sebastian@malton.name> * Don't export forumsUrl to extension API - Also just remove slack URL Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots again Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots again v3 Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert remove slackUrl Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix filtering Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix readme Signed-off-by: Sebastian Malton <sebastian@malton.name> * More of a fix Signed-off-by: Sebastian Malton <sebastian@malton.name> * Try again Signed-off-by: Sebastian Malton <sebastian@malton.name> * Slightly better for now Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> * "Release 6.4.0-beta.17" Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> Co-authored-by: Roman <ixrock@gmail.com>

Nokel81 added 2 commits February 23, 2023 12:51

Various improvements to release-tool

3658e9d

- Pass more IO from script to user to provide better UX - Interactive versioning using lerna directly - Remove all CMD args in favour of interactive Signed-off-by: Sebastian Malton <sebastian@malton.name>

Remove some more unnecessary console logs

f0ceae8

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Nokel81 added the chore label Feb 23, 2023

Nokel81 added this to the 6.5.0 milestone Feb 23, 2023

Nokel81 requested a review from a team as a code owner February 23, 2023 17:53

Nokel81 requested review from jansav and Iku-turso and removed request for a team February 23, 2023 17:53

jim-docker reviewed Feb 23, 2023

View reviewed changes

packages/release-tool/src/index.ts Outdated Show resolved Hide resolved

packages/release-tool/src/index.ts Show resolved Hide resolved

Nokel81 added 2 commits February 23, 2023 16:16

Resolve comments

7f928f6

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Fix repoRoot issue

b10383f

Signed-off-by: Sebastian Malton <sebastian@malton.name>

jim-docker reviewed Feb 23, 2023

View reviewed changes

packages/release-tool/src/index.ts Outdated Show resolved Hide resolved

Nokel81 added 2 commits February 24, 2023 10:18

De-spagetti-ify release-tool

671fc30

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Fix bugs related to picking PRs

f8d7917

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Nokel81 modified the milestones: 6.5.0, 6.4.0 Feb 24, 2023

jim-docker reviewed Feb 24, 2023

View reviewed changes

packages/release-tool/src/index.ts Outdated Show resolved Hide resolved

Nokel81 and others added 5 commits February 24, 2023 13:23

Fix name

08c42c0

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Improve display after picking PRs

5c3a1eb

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Rename pickWhichPRsToUse

123f852

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Add line describing what to do

be2d19b

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Fix not displaying output after cherry-pick fails

daad7e4

Signed-off-by: Sebastian Malton <sebastian@malton.name>

jim-docker reviewed Feb 24, 2023

View reviewed changes

jim-docker approved these changes Feb 24, 2023

View reviewed changes

Nokel81 merged commit 5ad582d into master Feb 24, 2023

Nokel81 deleted the improve-release-tool branch February 24, 2023 21:47

Nokel81 mentioned this pull request Feb 24, 2023

Release 6.4.0-beta.17 #7237

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various improvements to release-tool #7232

Various improvements to release-tool #7232

Nokel81 commented Feb 23, 2023

jim-docker left a comment

Nokel81 commented Feb 23, 2023

Nokel81 commented Feb 23, 2023

jim-docker left a comment

Nokel81 commented Feb 24, 2023

Nokel81 commented Feb 24, 2023

jim-docker left a comment

jim-docker Feb 24, 2023

jim-docker Feb 24, 2023

Nokel81 Feb 24, 2023

Nokel81 commented Feb 24, 2023

jim-docker commented Feb 24, 2023

Nokel81 commented Feb 24, 2023

Various improvements to release-tool #7232

Various improvements to release-tool #7232

Conversation

Nokel81 commented Feb 23, 2023

jim-docker left a comment

Choose a reason for hiding this comment

Nokel81 commented Feb 23, 2023

Nokel81 commented Feb 23, 2023

jim-docker left a comment

Choose a reason for hiding this comment

Nokel81 commented Feb 24, 2023

Nokel81 commented Feb 24, 2023

jim-docker left a comment

Choose a reason for hiding this comment

jim-docker Feb 24, 2023

Choose a reason for hiding this comment

jim-docker Feb 24, 2023

Choose a reason for hiding this comment

Nokel81 Feb 24, 2023

Choose a reason for hiding this comment

Nokel81 commented Feb 24, 2023

jim-docker commented Feb 24, 2023

Nokel81 commented Feb 24, 2023