From 1579ef04f089af8e73b7dff81d627257282f7752 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 21 Apr 2024 00:35:28 +0800 Subject: [PATCH 1/5] :art: Update CD script --- .github/workflows/cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 430d51c57..142c5c235 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -156,6 +156,8 @@ jobs: - name: Building UI run: pnpm run build working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app + env: + COREPACK_ENABLE_STRICT: 0 - name: Remove Build Directory uses: JesseTG/rm@v1.0.2 From 6f849be3795296452033728ffcf304d9bbee67f0 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 21 Apr 2024 00:39:22 +0800 Subject: [PATCH 2/5] :art: Update CD script --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 142c5c235..f3b326420 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -152,12 +152,12 @@ jobs: - name: Install Node Dependencies run: pnpm install --no-frozen-lockfile working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app + env: + COREPACK_ENABLE_STRICT: 0 - name: Building UI run: pnpm run build working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - env: - COREPACK_ENABLE_STRICT: 0 - name: Remove Build Directory uses: JesseTG/rm@v1.0.2 From 1a082ffb041cceaee1d9457d9d0fbde66b251323 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 21 Apr 2024 00:42:38 +0800 Subject: [PATCH 3/5] :art: Update CD script --- .github/workflows/cd.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f3b326420..8da70cb14 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -7,7 +7,6 @@ on: workflow_dispatch: jobs: - create_release: name: Create Release runs-on: ubuntu-latest @@ -158,6 +157,8 @@ jobs: - name: Building UI run: pnpm run build working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app + env: + COREPACK_ENABLE_STRICT: 0 - name: Remove Build Directory uses: JesseTG/rm@v1.0.2 @@ -202,6 +203,8 @@ jobs: - name: Building Electron run: pnpm run ${{ matrix.config.electron_args }} working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app + env: + COREPACK_ENABLE_STRICT: 0 - name: Upload Release uses: actions/upload-release-asset@v1 From 9fba19866d250a48d92b92bb46bae42aeb5672fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9B=E4=BA=BD?= <83791825+Soltus@users.noreply.github.com> Date: Sun, 21 Apr 2024 09:35:32 +0800 Subject: [PATCH 4/5] Update cd.yml (#11096) --- .github/workflows/cd.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8da70cb14..b3071b9f3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -14,6 +14,7 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} release_version: ${{ steps.release_info.outputs.release_version }} version: ${{ steps.version.outputs.value }} + packageManager: ${{ steps.packageManager.outputs.value }} steps: - name: Checkout code uses: actions/checkout@v3 @@ -52,6 +53,12 @@ jobs: with: cmd: 'jq .version app/package.json -r' + - name: Extract packageManager from package.json + uses: sergeysova/jq-action@v2 + id: packageManager + with: + cmd: "jq .packageManager app/package.json -r" + - name: Create Release id: create_release uses: ncipollo/release-action@v1 @@ -140,12 +147,12 @@ jobs: GOARCH: ${{ matrix.config.goarch }} - name: Set up Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Install Node pnpm - run: npm install -g pnpm + run: npm install -g ${{ needs.create_release.outputs.packageManager }} working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - name: Install Node Dependencies From 2acea3dc8f857780b2932e89e99ed112b2d4e035 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 21 Apr 2024 09:36:30 +0800 Subject: [PATCH 5/5] :art: Update CD script --- .github/workflows/cd.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b3071b9f3..25584b4ab 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -158,14 +158,10 @@ jobs: - name: Install Node Dependencies run: pnpm install --no-frozen-lockfile working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - env: - COREPACK_ENABLE_STRICT: 0 - + - name: Building UI run: pnpm run build working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - env: - COREPACK_ENABLE_STRICT: 0 - name: Remove Build Directory uses: JesseTG/rm@v1.0.2 @@ -210,8 +206,6 @@ jobs: - name: Building Electron run: pnpm run ${{ matrix.config.electron_args }} working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - env: - COREPACK_ENABLE_STRICT: 0 - name: Upload Release uses: actions/upload-release-asset@v1