6

Hi-Windom · Apr 18, 2024 · 760c8f2 · 760c8f2
1 parent c6c8d3c
commit 760c8f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/Codecov.yml b/.github/workflows/Codecov.yml
@@ -20,21 +20,26 @@ jobs:
       - name: Checkout repository and submodules
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+            submodules: recursive
       - name: Extract packageManager from package.json
         uses: sergeysova/jq-action@v2
         id: packageManager
         with:
-              cmd: "jq .packageManager ${{ matrix.string.package_json }} -r"
+            cmd: "jq .packageManager ${{ matrix.string.package_json }} -r"
+      - name: Extract actionInstallCommand from package.json
+        uses: sergeysova/jq-action@v2
+        id: actionInstallCommand
+        with:
+            cmd: "jq .actionInstallCommand ${{ matrix.string.package_json }} -r"
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+            node-version: 20
       - name: Install Node pnpm
         run: npm install -g ${{ steps.packageManager.outputs.value }}
         working-directory: app
       - name: Install dependencies
-        run: pnpm install
+        run: ${{ steps.actionInstallCommand.outputs.value }}
         working-directory: app
       - name: Run tests and collect coverage
         run: pnpm run test

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -22,6 +22,7 @@ jobs:
       release_version: ${{ steps.release_info.outputs.release_version }}
       version: ${{ steps.version.outputs.value }}
       packageManager: ${{ steps.packageManager.outputs.value }}
+      actionInstallCommand: ${{ steps.actionInstallCommand.outputs.value }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -56,6 +57,12 @@ jobs:
         with:
             cmd: "jq .packageManager ${{ matrix.string.package_json }} -r"
 
+      - name: Extract actionInstallCommand from package.json
+        uses: sergeysova/jq-action@v2
+        id: actionInstallCommand
+        with:
+            cmd: "jq .actionInstallCommand ${{ matrix.string.package_json }} -r"
+
       - id: thisLatestRelease
         uses: K-Sillot/github-action-get-latest-release@master
         with:
@@ -212,7 +219,7 @@ jobs:
         run: pnpm config set registry https://registry.npmjs.org/ --location project
         working-directory: ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}/app
       - name: Install Node Dependencies
-        run: pnpm install --no-frozen-lockfile
+        run: ${{ needs.create_release.outputs.actionInstallCommand }}
         working-directory: ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}/app
 
       - name: Building UI

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.29.601",
+  "version": "0.29.611",
   "syv": "3.0.10",
   "sypv": "[3.0.9]",
   "description": "Build Your Eternal Digital Garden",
@@ -13,6 +13,7 @@
     "pnpm": ">=9.0.0"
   },
   "packageManager": "pnpm@9.0.2",
+  "actionInstallCommand": "pnpm install --no-frozen-lockfile",
   "scripts": {
     "cli": "node ./package.cli.mjs",
     "dlv": "echo '注意：dlv debug 是否在独立终端运行中（需要在dlv里执行continue）？没有请先启动（终端工作路径是 kernel/main.go 所在目录），不需要内核调试则应该运行 pnpm run start 命令\n' && pause && NODE_ENV=development MODE=dlv electron-forge start",