mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Merge branch 'master' into monaco_editor_refactoring
# Conflicts: # src/common/user-store/user-store.ts # src/renderer/bootstrap.tsx # src/renderer/components/dock/__test__/log-tab.store.test.ts # src/renderer/utils/storageHelper.ts
This commit is contained in:
commit
21296d6d12
74 files changed
+988
-513
No files matched your search
@@ -26,7 +26,7 @@ import * as uuid from "uuid";
|
||||
import { ElectronApplication, Frame, Page, _electron as electron } from "playwright";
|
||||
import { noop } from "lodash";
|
||||
|
||||
export const AppPaths: Partial<Record<NodeJS.Platform, string>> = {
|
||||
export const appPaths: Partial<Record<NodeJS.Platform, string>> = {
|
||||
"win32": "./dist/win-unpacked/OpenLens.exe",
|
||||
"linux": "./dist/linux-unpacked/open-lens",
|
||||
"darwin": "./dist/mac/OpenLens.app/Contents/MacOS/OpenLens",
|
||||
@@ -65,7 +65,7 @@ export async function start() {
|
||||
|
||||
const app = await electron.launch({
|
||||
args: ["--integration-testing"], // this argument turns off the blocking of quit
|
||||
executablePath: AppPaths[process.platform],
|
||||
executablePath: appPaths[process.platform],
|
||||
bypassCSP: true,
|
||||
env: {
|
||||
CICD,
|
||||
|
||||
Reference in new issue
Block a user