Merge pull request #632 from Hi-Windom/v0.29

6
Hi-Windom · Apr 18, 2024 · 6e5544d · 6e5544d
2 parents fd87137 + c6c8d3c
commit 6e5544d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/Codecov.yml b/.github/workflows/Codecov.yml
@@ -15,29 +15,29 @@ jobs:
           string:
             - repo_name: "Sillot"
               repo_owner: "Hi-Windom"
+              package_json: "app/package.json"
     steps:
       - name: Checkout repository and submodules
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          path: ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}
       - name: Extract packageManager from package.json
         uses: sergeysova/jq-action@v2
         id: packageManager
         with:
-              cmd: "jq .packageManager ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}/app/package.json -r"
+              cmd: "jq .packageManager ${{ matrix.string.package_json }} -r"
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
           node-version: 20
       - name: Install Node pnpm
         run: npm install -g ${{ steps.packageManager.outputs.value }}
-        working-directory: ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}/app
+        working-directory: app
       - name: Install dependencies
         run: pnpm install
-        working-directory: ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}/app
+        working-directory: app
       - name: Run tests and collect coverage
         run: pnpm run test
-        working-directory: ${{ github.workspace }}/${{ matrix.string.repo_owner }}/${{ matrix.string.repo_name }}/app
+        working-directory: app
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -16,6 +16,7 @@ jobs:
             - repo_name_android: "Sillot-android"
               repo_name: "Sillot"
               repo_owner: "Hi-Windom"
+              package_json: "app/package.json"
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       release_version: ${{ steps.release_info.outputs.release_version }}
@@ -35,25 +36,25 @@ jobs:
         uses: sergeysova/jq-action@v2
         id: version
         with:
-          cmd: "jq .version app/package.json -r"
+          cmd: "jq .version ${{ matrix.string.package_json }} -r"
 
       - name: Extract SiYuan version from package.json
         uses: sergeysova/jq-action@v2
         id: syv
         with:
-          cmd: "jq .syv app/package.json -r"
+          cmd: "jq .syv ${{ matrix.string.package_json }} -r"
 
       - name: Extract SiYuan version from package.json
         uses: sergeysova/jq-action@v2
         id: sypv
         with:
-            cmd: "jq .sypv app/package.json -r"
+            cmd: "jq .sypv ${{ matrix.string.package_json }} -r"
 
       - name: Extract packageManager from package.json
         uses: sergeysova/jq-action@v2
         id: packageManager
         with:
-            cmd: "jq .packageManager app/package.json -r"
+            cmd: "jq .packageManager ${{ matrix.string.package_json }} -r"
 
       - id: thisLatestRelease
         uses: K-Sillot/github-action-get-latest-release@master

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.29.501",
+  "version": "0.29.601",
   "syv": "3.0.10",
   "sypv": "[3.0.9]",
   "description": "Build Your Eternal Digital Garden",