From 15f609f95c4235b292f0a95daadc4b07ce43c57e Mon Sep 17 00:00:00 2001 From: geekgeekrun Date: Mon, 8 Apr 2024 09:53:58 +0800 Subject: [PATCH] try to fix wrong ci script - file is not exist --- .github/workflows/build-ui.yml | 1 - .github/workflows/release-ui.yml | 1 - packages/ui/package.json | 2 +- packages/ui/scripts/github-ci-build.mjs | 5 +- packages/ui/scripts/release-new-version.mjs | 4 +- .../ui/scripts/run-build-sqlite-plugin.mjs | 2 + .../ui/scripts/steps/build-sqlite-plugin.mjs | 26 ++++++++++ .../steps/build-ui-on-current-platform.mjs | 30 +++++++++++ packages/ui/scripts/steps/build.mjs | 50 ------------------- 9 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 packages/ui/scripts/run-build-sqlite-plugin.mjs create mode 100644 packages/ui/scripts/steps/build-sqlite-plugin.mjs create mode 100644 packages/ui/scripts/steps/build-ui-on-current-platform.mjs delete mode 100644 packages/ui/scripts/steps/build.mjs diff --git a/.github/workflows/build-ui.yml b/.github/workflows/build-ui.yml index 508fd55..2874d8e 100644 --- a/.github/workflows/build-ui.yml +++ b/.github/workflows/build-ui.yml @@ -49,5 +49,4 @@ jobs: - name: Build run: | - cd packages/ui node ./scripts/github-ci-build.mjs \ No newline at end of file diff --git a/.github/workflows/release-ui.yml b/.github/workflows/release-ui.yml index c29c8e4..4b7dbe8 100644 --- a/.github/workflows/release-ui.yml +++ b/.github/workflows/release-ui.yml @@ -28,7 +28,6 @@ jobs: - name: Build run: | - cd packages/ui node ./scripts/github-ci-build.mjs - name: Create Release diff --git a/packages/ui/package.json b/packages/ui/package.json index 5645285..6f66cf0 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -13,7 +13,7 @@ "dev:geek-auto-start-chat-with-boss-daemon-only": "cross-env MAIN_BOSSGEEKGO_UI_RUN_MODE=geekAutoStartWithBossDaemon pnpm run dev", "dev:check-and-download-dependencies-for-init-only": "cross-env MAIN_BOSSGEEKGO_UI_RUN_MODE=checkAndDownloadDependenciesForInit pnpm run dev", "dev:launch-bosszhipin-login-page-with-preload-extension-only": "cross-env MAIN_BOSSGEEKGO_UI_RUN_MODE=launchBossZhipinLoginPageWithPreloadExtension pnpm run dev", - "build": "node scripts/build.mjs && electron-vite build", + "build": "node scripts/run-build-sqlite-plugin.mjs && electron-vite build", "format": "prettier --write .", "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts,.vue --fix", "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false", diff --git a/packages/ui/scripts/github-ci-build.mjs b/packages/ui/scripts/github-ci-build.mjs index 1887c24..149b5f2 100644 --- a/packages/ui/scripts/github-ci-build.mjs +++ b/packages/ui/scripts/github-ci-build.mjs @@ -1,3 +1,2 @@ -import build from './steps/build.mjs' - -build() +import buildUiOnCurrentPlatform from './steps/build-ui-on-current-platform.mjs' +buildUiOnCurrentPlatform() diff --git a/packages/ui/scripts/release-new-version.mjs b/packages/ui/scripts/release-new-version.mjs index 447cb23..c893a28 100644 --- a/packages/ui/scripts/release-new-version.mjs +++ b/packages/ui/scripts/release-new-version.mjs @@ -1,8 +1,8 @@ -import build from './steps/build.mjs' +import buildUiOnCurrentPlatform from './steps/build-ui-on-current-platform.mjs'; import increasePackageVersion from './steps/increase-package-version.mjs' import releaseVersion from './steps/release-version.mjs' ;(async () => { await increasePackageVersion() - await build() + await buildUiOnCurrentPlatform() await releaseVersion() })() diff --git a/packages/ui/scripts/run-build-sqlite-plugin.mjs b/packages/ui/scripts/run-build-sqlite-plugin.mjs new file mode 100644 index 0000000..ca1674e --- /dev/null +++ b/packages/ui/scripts/run-build-sqlite-plugin.mjs @@ -0,0 +1,2 @@ +import buildSqlitePlugin from './steps/build-sqlite-plugin.mjs' +buildSqlitePlugin() diff --git a/packages/ui/scripts/steps/build-sqlite-plugin.mjs b/packages/ui/scripts/steps/build-sqlite-plugin.mjs new file mode 100644 index 0000000..b3c8c25 --- /dev/null +++ b/packages/ui/scripts/steps/build-sqlite-plugin.mjs @@ -0,0 +1,26 @@ +import childProcess from 'node:child_process' +import path from 'node:path' +import url from 'node:url' + +export default function buildSqlitePlugin() { + const rawCwd = process.cwd() + const __dirname = url.fileURLToPath(new URL('.', import.meta.url)) + + const sqlitePluginDirPath = path.join(__dirname, '../../../sqlite-plugin') + process.chdir(sqlitePluginDirPath) + try { + const sqlitePluginBuildProcess = childProcess.spawnSync('pnpm run build', { + stdio: ['inherit', 'inherit', 'inherit'], + shell: true + }) + process.chdir(rawCwd) + if (sqlitePluginBuildProcess.error) { + throw sqlitePluginBuildProcess.error + } + } catch (error) { + process.chdir(rawCwd) + console.error('error encounter when build sqlite plugin:') + console.error(error) + process.exit(1) + } +} diff --git a/packages/ui/scripts/steps/build-ui-on-current-platform.mjs b/packages/ui/scripts/steps/build-ui-on-current-platform.mjs new file mode 100644 index 0000000..680e895 --- /dev/null +++ b/packages/ui/scripts/steps/build-ui-on-current-platform.mjs @@ -0,0 +1,30 @@ +import childProcess from 'node:child_process' +import os from 'node:os' + +const currentOsPlatform = os.platform() +const osPlatformToBuildCommandMap = { + darwin: 'mac', + linux: 'linux', + win32: 'win' +} + +export default function buildUiOnCurrentPlatform() { + try { + const uiBuildProcess = childProcess.spawnSync( + `pnpm run build:${osPlatformToBuildCommandMap[currentOsPlatform]}`, + { + stdio: ['inherit', 'inherit', 'inherit'], + shell: true + } + ) + if (uiBuildProcess.error) { + throw uiBuildProcess.error + } + } catch (error) { + console.error('error encounter when build ui:') + console.error(error) + process.exit(1) + } +} + +buildUiOnCurrentPlatform() diff --git a/packages/ui/scripts/steps/build.mjs b/packages/ui/scripts/steps/build.mjs deleted file mode 100644 index 1508854..0000000 --- a/packages/ui/scripts/steps/build.mjs +++ /dev/null @@ -1,50 +0,0 @@ -import childProcess from 'node:child_process' -import path from 'node:path' -import os from 'node:os' -import url from 'node:url' - -const currentOsPlatform = os.platform() -const osPlatformToBuildCommandMap = { - darwin: 'mac', - linux: 'linux', - win32: 'win' -} - -export default function build() { - const rawCwd = process.cwd() - const __dirname = url.fileURLToPath(new URL('.', import.meta.url)) - - const sqlitePluginDirPath = path.join(__dirname, '../../sqlite-plugin') - process.chdir(sqlitePluginDirPath) - try { - const sqlitePluginBuildProcess = childProcess.spawnSync('pnpm run build', { - stdio: ['inherit', 'inherit', 'inherit'], - shell: true - }) - process.chdir(rawCwd) - if (sqlitePluginBuildProcess.error) { - throw sqlitePluginBuildProcess.error - } - } catch (error) { - process.chdir(rawCwd) - console.error('error encounter when build sqlite plugin:') - console.error(error) - process.exit(1) - } - try { - const uiBuildProcess = childProcess.spawnSync( - `pnpm run build:${osPlatformToBuildCommandMap[currentOsPlatform]}`, - { - stdio: ['inherit', 'inherit', 'inherit'], - shell: true - } - ) - if (uiBuildProcess.error) { - throw uiBuildProcess.error - } - } catch (error) { - console.error('error encounter when build ui:') - console.error(error) - process.exit(1) - } -}