Release 6.5.1

Signed-off-by: Sebastian Malton <sebastian@malton.name>
lensapp · May 29, 2023 · eaa235b · eaa235b
1 parent cde5cfe
commit eaa235b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 32 deletions.
diff --git a/open-lens/package.json b/open-lens/package.json
@@ -4,7 +4,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"
@@ -184,15 +184,15 @@
     "@k8slens/application-for-electron-main": "^6.5.0",
     "@k8slens/button": "^1.0.0",
     "@k8slens/cluster-settings": "^6.5.0",
-    "@k8slens/core": "^6.5.0",
+    "@k8slens/core": "^6.5.1",
     "@k8slens/ensure-binaries": "^6.5.0",
     "@k8slens/error-boundary": "^1.0.0",
     "@k8slens/event-emitter": "^1.0.0",
     "@k8slens/feature-core": "^6.5.0",
     "@k8slens/keyboard-shortcuts": "^1.0.0",
     "@k8slens/kube-object": "^1.0.0",
     "@k8slens/kubectl-versions": "^1.0.0",
-    "@k8slens/legacy-extension-example": "^1.0.0",
+    "@k8slens/legacy-extension-example": "^1.0.1",
     "@k8slens/legacy-extensions": "^1.0.0",
     "@k8slens/legacy-global-di": "^1.0.0",
     "@k8slens/list-layout": "^1.0.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -3,7 +3,7 @@
   "productName": "",
   "description": "Lens Desktop Core",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"

diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json
@@ -2,7 +2,7 @@
   "name": "@k8slens/extensions",
   "productName": "OpenLens extensions",
   "description": "OpenLens - Open Source Kubernetes IDE: extensions",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
   "main": "dist/extension-api.js",
@@ -25,7 +25,7 @@
     "clean": "rimraf dist/"
   },
   "dependencies": {
-    "@k8slens/core": "6.5.0"
+    "@k8slens/core": "6.5.1"
   },
   "devDependencies": {
     "@types/node": "^16.18.25",

diff --git a/packages/legacy-extension-example/package.json b/packages/legacy-extension-example/package.json
@@ -2,7 +2,7 @@
   "name": "@k8slens/legacy-extension-example",
   "private": false,
   "description": "An example bundled Lens extensions using the v1 API",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "commonjs",
   "files": [
     "dist"
@@ -36,7 +36,7 @@
     "lint:fix": "lens-lint --fix"
   },
   "devDependencies": {
-    "@k8slens/extensions": "^6.5.0",
+    "@k8slens/extensions": "^6.5.1",
     "@types/node": "^16.18.25",
     "typescript": "^4.9.5",
     "webpack": "^5.81.0",

diff --git a/packages/release-tool/package.json b/packages/release-tool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@k8slens/release-tool",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "description": "Release tool for lens monorepo",
   "license": "MIT",
   "private": true,

diff --git a/packages/release-tool/src/index.ts b/packages/release-tool/src/index.ts
@@ -156,8 +156,8 @@ function formatSemverForMilestone(version: SemVer): string {
   return `${version.major}.${version.minor}.${version.patch}`;
 }
 
-function formatVersionForPickingPrs(version: SemVer): string {
-  return `${version.major}.${version.minor}.${version.patch}`;
+function formatVersionForPickingPrs(version: SemVer, isMasterBranch: boolean): string {
+  return `${version.major}.${version.minor}.${version.patch + (isMasterBranch ? 0 : 1)}`;
 }
 
 async function deleteAndClosePreviousReleaseBranch(prBase: string, prBranch: string) {
@@ -276,10 +276,10 @@ function sortExtendedGithubPrData(left: ExtendedGithubPrData, right: ExtendedGit
   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}...`);
 
-  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", {
     owner: "lensapp",
     repo: "lens",
@@ -486,11 +486,10 @@ async function createRelease(): Promise<void> {
     await bumpPackageVersions();
   }
 
-  const relevantPrs = await getRelevantPRs(previousReleasedVersion, "master");
-
-  if (prBase !== "master") {
-    relevantPrs.push(...await getRelevantPRs(previousReleasedVersion, prBase));
-  }
+  const relevantPrs = [
+    ...await getRelevantPRs(previousReleasedVersion, "master", isMasterBranch),
+    ...(prBase !== "master" ? await getRelevantPRs(previousReleasedVersion, prBase, isMasterBranch) : []),
+  ];
 
   const selectedPrs = await pickRelevantPrs(relevantPrs, isMasterBranch);