From 81f2548245bcf947dc969546b600f88a78e1e1b8 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 13 Sep 2022 14:11:29 -0400 Subject: [PATCH] Stop overriding intree extension versions on build Signed-off-by: Sebastian Malton --- Makefile | 5 -- build/set_build_version.ts | 68 ------------------- .../kube-object-event-status/package.json | 2 +- .../metrics-cluster-feature/package.json | 2 +- extensions/node-menu/package.json | 2 +- extensions/pod-menu/package.json | 2 +- package.json | 1 - 7 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 build/set_build_version.ts diff --git a/Makefile b/Makefile index d04b3febe1..b2ac05ad3c 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ integration: build .PHONY: build build: node_modules binaries/client - yarn run npm:fix-build-version $(MAKE) build-extensions -B yarn run build:tray-icons yarn run compile @@ -63,10 +62,6 @@ ifeq "$(DETECTED_OS)" "Windows" endif yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS) -.PHONY: update-extension-locks -update-extension-locks: - $(foreach dir, $(extensions), (cd $(dir) && rm package-lock.json && ../../node_modules/.bin/npm install --package-lock-only);) - .NOTPARALLEL: $(extension_node_modules) $(extension_node_modules): node_modules cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save diff --git a/build/set_build_version.ts b/build/set_build_version.ts deleted file mode 100644 index 4df7ad4b96..0000000000 --- a/build/set_build_version.ts +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import * as fse from "fs-extra"; -import * as path from "path"; -import appInfo from "../package.json"; -import semver from "semver"; -import fastGlob from "fast-glob"; - -const packagePath = path.join(__dirname, "../package.json"); -const versionInfo = semver.parse(appInfo.version); -const buildNumber = process.env.BUILD_NUMBER || Date.now().toString(); - -function getBuildChannel(): string { - const preRelease = versionInfo.prerelease?.[0]; - - switch (preRelease) { - case "alpha": - case "beta": - case "rc": - return preRelease; - case undefined: - case "latest": - return "latest"; // needed because electron-updater does not take build information into account when resolving if update is available - default: - throw new Error(`invalid pre-release ${preRelease}`); - } -} - -async function writeOutExtensionVersion(manifestPath: string) { - const extensionPackageJson = await fse.readJson(manifestPath); - - extensionPackageJson.version = appInfo.version; - - return fse.writeJson(manifestPath, extensionPackageJson, { - spaces: 2, - }); -} - -async function writeOutNewVersions() { - await Promise.all([ - fse.writeJson(packagePath, appInfo, { - spaces: 2, - }), - ...(await fastGlob(["extensions/*/package.json"])).map(writeOutExtensionVersion), - ]); -} - -function main() { - const prereleaseParts: string[] = [getBuildChannel()]; - - if (versionInfo.prerelease && versionInfo.prerelease.length > 1) { - prereleaseParts.push(versionInfo.prerelease[1].toString()); - } - - prereleaseParts.push(buildNumber); - - appInfo.version = `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}-${prereleaseParts.join(".")}`; - - writeOutNewVersions() - .catch((error) => { - console.error(error); - process.exit(1); - }); -} - -main(); diff --git a/extensions/kube-object-event-status/package.json b/extensions/kube-object-event-status/package.json index 53db719a83..d833d2b188 100644 --- a/extensions/kube-object-event-status/package.json +++ b/extensions/kube-object-event-status/package.json @@ -1,6 +1,6 @@ { "name": "kube-object-event-status", - "version": "0.0.1", + "version": "6.1.0", "description": "Adds kube object status from events", "renderer": "dist/renderer.js", "lens": { diff --git a/extensions/metrics-cluster-feature/package.json b/extensions/metrics-cluster-feature/package.json index 41da8f3f86..03ad0df7a5 100644 --- a/extensions/metrics-cluster-feature/package.json +++ b/extensions/metrics-cluster-feature/package.json @@ -1,6 +1,6 @@ { "name": "lens-metrics-cluster-feature", - "version": "0.0.1", + "version": "6.1.0", "description": "Lens metrics cluster feature", "renderer": "dist/renderer.js", "lens": { diff --git a/extensions/node-menu/package.json b/extensions/node-menu/package.json index 7705b4f606..3b56dc6e62 100644 --- a/extensions/node-menu/package.json +++ b/extensions/node-menu/package.json @@ -1,6 +1,6 @@ { "name": "lens-node-menu", - "version": "0.0.1", + "version": "6.1.0", "description": "Lens node menu", "renderer": "dist/renderer.js", "lens": { diff --git a/extensions/pod-menu/package.json b/extensions/pod-menu/package.json index 79e4278b32..ba3f107f80 100644 --- a/extensions/pod-menu/package.json +++ b/extensions/pod-menu/package.json @@ -1,6 +1,6 @@ { "name": "lens-pod-menu", - "version": "0.0.1", + "version": "6.1.0", "description": "Lens pod menu", "renderer": "dist/renderer.js", "lens": { diff --git a/package.json b/package.json index 90438b7222..de2680ca4a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "compile:main": "yarn run webpack --config webpack/main.ts", "compile:renderer": "yarn run webpack --config webpack/renderer.ts", "compile:extension-types": "yarn run webpack --config webpack/extensions.ts", - "npm:fix-build-version": "yarn run ts-node build/set_build_version.ts", "npm:fix-package-version": "yarn run ts-node build/set_npm_version.ts", "build:linux": "yarn run compile && electron-builder --linux --dir", "build:mac": "yarn run compile && electron-builder --mac --dir",