From c89fe17aba329202b988f86798bb29226dce159d Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 13:33:47 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 41b2da59..2e7ee41b 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-22.04:host + runs-on: ubuntu-22.04 strategy: matrix: project: [web-office] From d6dcb94bc20c2e6c10c58a0b10ed69808b2fa025 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 13:34:23 +0800 Subject: [PATCH 02/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 2e7ee41b..e838f510 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04:host strategy: matrix: project: [web-office] From e7b3b527d70ebe31f647b74d1b59a22cd550d8aa Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 13:42:22 +0800 Subject: [PATCH 03/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index e838f510..d3213ea2 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-22.04:host + runs-on: ubuntu-22.04:docker://node:20.5.1-bookworm-slim strategy: matrix: project: [web-office] From 58533e58aa6dbe724decc8edf87ec68ae83c401b Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 13:44:37 +0800 Subject: [PATCH 04/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index d3213ea2..05965b99 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-22.04:docker://node:20.5.1-bookworm-slim + runs-on: host strategy: matrix: project: [web-office] From 07f60e773505ce2e9d5c30f676cf9316ab0a6338 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 13:45:11 +0800 Subject: [PATCH 05/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 05965b99..eb744f8c 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: host + runs-on: pansoft strategy: matrix: project: [web-office] From 3d09839330770cd3dcbac8208b45b394c92a00a0 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 13:53:12 +0800 Subject: [PATCH 06/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index eb744f8c..60403ed8 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: pansoft + runs-on: ubuntu-latest strategy: matrix: project: [web-office] From a09298954baedc55266d92453bffa6364cdacbb2 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 14:01:53 +0800 Subject: [PATCH 07/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 60403ed8..6c51c61e 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -10,12 +10,12 @@ jobs: matrix: project: [web-office] - steps: - # Set up Node.js environment - - name: Set up Node.js - uses: https://gitee.com/z9130/actions-setup-node.git@v3 - with: - node-version: "22" # 确保使用与你项目兼容的 Node.js 版本 + # steps: + # # Set up Node.js environment + # - name: Set up Node.js + # uses: https://gitee.com/z9130/actions-setup-node.git@v3 + # with: + # node-version: "22" # 确保使用与你项目兼容的 Node.js 版本 # Checkout the repository - name: Checkout repository From 34185a4a04815ff3fb0ac5afa58ffcaf96d1074c Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 14:02:14 +0800 Subject: [PATCH 08/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 6c51c61e..4eefdbd2 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -10,7 +10,7 @@ jobs: matrix: project: [web-office] - # steps: + steps: # # Set up Node.js environment # - name: Set up Node.js # uses: https://gitee.com/z9130/actions-setup-node.git@v3 From 40c6c2efdc6b91f6913dab3c2169d349f1bf5920 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 14:05:04 +0800 Subject: [PATCH 09/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 4eefdbd2..b8e40568 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -10,7 +10,7 @@ jobs: matrix: project: [web-office] - steps: + # steps: # # Set up Node.js environment # - name: Set up Node.js # uses: https://gitee.com/z9130/actions-setup-node.git@v3 @@ -18,8 +18,8 @@ jobs: # node-version: "22" # 确保使用与你项目兼容的 Node.js 版本 # Checkout the repository - - name: Checkout repository - uses: https://gitee.com/z9130/actions-checkout.git@v4 + # - name: Checkout repository + # uses: https://gitee.com/z9130/actions-checkout.git@v4 # Install pnpm - name: Install pnpm From f7f3e650fe6aa4e38aba677068dd34ffce8362de Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 14:05:19 +0800 Subject: [PATCH 10/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index b8e40568..6e88e2c5 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -10,7 +10,7 @@ jobs: matrix: project: [web-office] - # steps: + steps: # # Set up Node.js environment # - name: Set up Node.js # uses: https://gitee.com/z9130/actions-setup-node.git@v3 From 0171cf4b6d6eb8b58a3de0b4752c0348edb4c3a8 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:10:01 +0800 Subject: [PATCH 11/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 6e88e2c5..ae59500f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -20,7 +20,9 @@ jobs: # Checkout the repository # - name: Checkout repository # uses: https://gitee.com/z9130/actions-checkout.git@v4 - + - run: npm config set registry https://registry.npmmirror.com + + # Install pnpm - name: Install pnpm run: npm install -g pnpm From 7c30d5f40c552de408e42a15ddc6f12c4f0131c7 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:17:23 +0800 Subject: [PATCH 12/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index ae59500f..8e33467f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -11,17 +11,21 @@ jobs: project: [web-office] steps: - # # Set up Node.js environment - # - name: Set up Node.js - # uses: https://gitee.com/z9130/actions-setup-node.git@v3 - # with: - # node-version: "22" # 确保使用与你项目兼容的 Node.js 版本 # Checkout the repository - # - name: Checkout repository - # uses: https://gitee.com/z9130/actions-checkout.git@v4 + # - name: Checkout the repository + # uses: actions/checkout@v4 + # with: + # fetch-depth: 0 + - name: Clone repository + run: | + git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git --depth 1 + cd your-repo + # Optionally check out a specific branch + git checkout test + + - name: set registry - run: npm config set registry https://registry.npmmirror.com - # Install pnpm - name: Install pnpm From 77c65d4652f2f2ca7c5c58144fed5e7c74b61135 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:17:53 +0800 Subject: [PATCH 13/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 8e33467f..38832f75 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -25,7 +25,7 @@ jobs: git checkout test - name: set registry - - run: npm config set registry https://registry.npmmirror.com + run: npm config set registry https://registry.npmmirror.com # Install pnpm - name: Install pnpm From 1014c7399bebd98d56b7f53c4046cafab73204d4 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:18:29 +0800 Subject: [PATCH 14/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 38832f75..fe21ca6f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -24,8 +24,7 @@ jobs: # Optionally check out a specific branch git checkout test - - name: set registry - run: npm config set registry https://registry.npmmirror.com + - run: npm config set registry https://registry.npmmirror.com # Install pnpm - name: Install pnpm From bfd420d7eeec41e264a514838dab8d64692b7c33 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:34:40 +0800 Subject: [PATCH 15/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index fe21ca6f..0f97ec85 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -12,17 +12,17 @@ jobs: steps: - # Checkout the repository - # - name: Checkout the repository - # uses: actions/checkout@v4 - # with: - # fetch-depth: 0 - - name: Clone repository - run: | - git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git --depth 1 - cd your-repo - # Optionally check out a specific branch - git checkout test + Checkout the repository + - name: Checkout the repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + # - name: Clone repository + # run: | + # git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git --depth 1 + # cd your-repo + # # Optionally check out a specific branch + # git checkout test - run: npm config set registry https://registry.npmmirror.com From b4a31145bc13069377aaec3e790b1a64fb29d801 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:34:56 +0800 Subject: [PATCH 16/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 0f97ec85..8f811a95 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -12,7 +12,7 @@ jobs: steps: - Checkout the repository + # Checkout the repository - name: Checkout the repository uses: actions/checkout@v4 with: From 5d677e627a3abb6cb7ffbd05149b31a8126539ea Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:40:15 +0800 Subject: [PATCH 17/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 8f811a95..64777d8f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -14,7 +14,7 @@ jobs: # Checkout the repository - name: Checkout the repository - uses: actions/checkout@v4 + uses: https://gitea.com/actions/checkout@v4 with: fetch-depth: 0 # - name: Clone repository From b5a9a37dd1cd47aa0aeb1fea7fe9d0744f6338db Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:42:00 +0800 Subject: [PATCH 18/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 64777d8f..6b0752c2 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -14,7 +14,7 @@ jobs: # Checkout the repository - name: Checkout the repository - uses: https://gitea.com/actions/checkout@v4 + uses: https://gitee.com/z9130/actions-checkout with: fetch-depth: 0 # - name: Clone repository From b9515d8282beddd7221ba84ad93984522895c3ee Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:42:25 +0800 Subject: [PATCH 19/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 6b0752c2..b903e063 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -14,7 +14,7 @@ jobs: # Checkout the repository - name: Checkout the repository - uses: https://gitee.com/z9130/actions-checkout + uses: https://gitee.com/z9130/actions-checkout@v4 with: fetch-depth: 0 # - name: Clone repository From 7f360aa458f3f7babec69f6ee20b179b93f6e4b8 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 15:44:34 +0800 Subject: [PATCH 20/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index b903e063..8255e7b9 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -13,16 +13,18 @@ jobs: steps: # Checkout the repository - - name: Checkout the repository - uses: https://gitee.com/z9130/actions-checkout@v4 - with: - fetch-depth: 0 - # - name: Clone repository - # run: | - # git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git --depth 1 - # cd your-repo - # # Optionally check out a specific branch - # git checkout test + # - name: Checkout the repository + # uses: https://gitee.com/z9130/actions-checkout@v4 + # with: + # fetch-depth: 0 + - name: Clone repository + run: | + sudo apt-get update + sudo apt-get install -y git + git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 + cd pansoft-plrl + # Optionally check out a specific branch + git checkout test - run: npm config set registry https://registry.npmmirror.com From c7cf9472d0f024107fc09e8f624caa4d3ef02999 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:05:26 +0800 Subject: [PATCH 21/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 8255e7b9..d1b0fe4f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -12,19 +12,19 @@ jobs: steps: - # Checkout the repository - # - name: Checkout the repository - # uses: https://gitee.com/z9130/actions-checkout@v4 - # with: - # fetch-depth: 0 - - name: Clone repository - run: | - sudo apt-get update - sudo apt-get install -y git - git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 - cd pansoft-plrl - # Optionally check out a specific branch - git checkout test + Checkout the repository + - name: Checkout the repository + uses: actions-checkout@v4 + with: + fetch-depth: 0 + # - name: Clone repository + # run: | + # sudo apt-get update + # sudo apt-get install -y git + # git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 + # cd pansoft-plrl + # # Optionally check out a specific branch + # git checkout test - run: npm config set registry https://registry.npmmirror.com From 7fecbf32d8013fb7e7dfc35d839a9a1ad3b1d123 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:05:32 +0800 Subject: [PATCH 22/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index d1b0fe4f..9e46ce64 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -12,7 +12,7 @@ jobs: steps: - Checkout the repository + # Checkout the repository - name: Checkout the repository uses: actions-checkout@v4 with: From 1e022c505b0d24eb7958eccb2b1e5b019bc42305 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:08:23 +0800 Subject: [PATCH 23/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 9e46ce64..2e4ec1c8 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -14,7 +14,7 @@ jobs: # Checkout the repository - name: Checkout the repository - uses: actions-checkout@v4 + uses: actions/checkout@v4 with: fetch-depth: 0 # - name: Clone repository From cbcd444f1bf9c927f8d125a901b266bd56f14554 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:09:51 +0800 Subject: [PATCH 24/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 2e4ec1c8..11d2c000 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -14,7 +14,7 @@ jobs: # Checkout the repository - name: Checkout the repository - uses: actions/checkout@v4 + uses: https://gitea.com/actions/checkout@v4 with: fetch-depth: 0 # - name: Clone repository From b5c9fa88a9b2b1e8bfcb9660ddffe8a7d9667ac3 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:17:08 +0800 Subject: [PATCH 25/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 11d2c000..e6c0d8c4 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04:host strategy: matrix: project: [web-office] From a6703937d2a9d2782188675273c3d1d64118020b Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:17:40 +0800 Subject: [PATCH 26/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index e6c0d8c4..d2b98471 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-22.04:host + runs-on: linux_amd64:host strategy: matrix: project: [web-office] From 6cca925507c42297c47006add80d6d78f5518c3e Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:29:29 +0800 Subject: [PATCH 27/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index d2b98471..085a5932 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -13,18 +13,18 @@ jobs: steps: # Checkout the repository - - name: Checkout the repository - uses: https://gitea.com/actions/checkout@v4 - with: - fetch-depth: 0 - # - name: Clone repository - # run: | - # sudo apt-get update - # sudo apt-get install -y git - # git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 - # cd pansoft-plrl - # # Optionally check out a specific branch - # git checkout test + # - name: Checkout the repository + # uses: https://gitea.com/actions/checkout@v4 + # with: + # fetch-depth: 0 + - name: Clone repository + run: | + apt-get update + apt-get install -y git + git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 + cd pansoft-plrl + # Optionally check out a specific branch + git checkout test - run: npm config set registry https://registry.npmmirror.com From 694ce14983368211937d2b4c8cde2bd95eef5828 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:29:47 +0800 Subject: [PATCH 28/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 085a5932..f84a69bc 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: linux_amd64:host + runs-on: ubuntu-latest strategy: matrix: project: [web-office] From 3c02020e5a93f415ca000beb5adc8cf7d2f7e958 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:31:45 +0800 Subject: [PATCH 29/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index f84a69bc..7e438036 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -30,16 +30,20 @@ jobs: # Install pnpm - name: Install pnpm - run: npm install -g pnpm + run: | + npm install -g pnpm + cd pansoft-plrl + pnpm install + pnpm build --filter apps/${{ matrix.project }} - # Install dependencies using Turborepo - - name: Install dependencies with Turborepo - run: pnpm install + # # Install dependencies using Turborepo + # - name: Install dependencies with Turborepo + # run: pnpm install - # Build the project - - name: Build project - env: - TURBO_FORCE: true # 强制全量构建,确保 Turborepo 正确地优化构建过程 - run: pnpm build --filter apps/${{ matrix.project }} + # # Build the project + # - name: Build project + # env: + # TURBO_FORCE: true # 强制全量构建,确保 Turborepo 正确地优化构建过程 + # run: pnpm build --filter apps/${{ matrix.project }} # 你可以在这里添加更多步骤,例如部署到服务器或生成的静态文件存储。 From c67451450e5028fdd1cd6864730b07597a04dda3 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:33:03 +0800 Subject: [PATCH 30/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 7e438036..089fc0ac 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -33,7 +33,7 @@ jobs: run: | npm install -g pnpm cd pansoft-plrl - pnpm install + pnpm install --no-frozen-lockfile pnpm build --filter apps/${{ matrix.project }} # # Install dependencies using Turborepo From 28a2c5eba12345fd9e2706e1bf00005761f42ab3 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:37:11 +0800 Subject: [PATCH 31/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 60 +++++++++++++++++------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 089fc0ac..ca3a990f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -1,7 +1,10 @@ name: Frontend CI/CD -on: [push] - +on: + push: + branches: + - main + - test jobs: build: @@ -12,38 +15,45 @@ jobs: steps: - # Checkout the repository - # - name: Checkout the repository - # uses: https://gitea.com/actions/checkout@v4 - # with: - # fetch-depth: 0 - - name: Clone repository + - name: Install Git run: | apt-get update apt-get install -y git + + - name: Output Node.js and npm version + run: | + echo "Node.js version:" + node -v + echo "npm version:" + npm -v + + - name: Clone repository + run: | + echo "Cloning repository..." git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 cd pansoft-plrl - # Optionally check out a specific branch git checkout test - - - run: npm config set registry https://registry.npmmirror.com - + echo "Repository cloned and checked out to test branch." + + - name: Set NPM registry + run: | + echo "Setting NPM registry..." + npm config set registry https://registry.npmmirror.com + echo "NPM registry set." + # Install pnpm - name: Install pnpm run: | + echo "Installing pnpm..." npm install -g pnpm + echo "pnpm installed." + + - name: Install dependencies and build + run: | cd pansoft-plrl + echo "Installing dependencies..." pnpm install --no-frozen-lockfile - pnpm build --filter apps/${{ matrix.project }} - - # # Install dependencies using Turborepo - # - name: Install dependencies with Turborepo - # run: pnpm install - - # # Build the project - # - name: Build project - # env: - # TURBO_FORCE: true # 强制全量构建,确保 Turborepo 正确地优化构建过程 - # run: pnpm build --filter apps/${{ matrix.project }} - - # 你可以在这里添加更多步骤,例如部署到服务器或生成的静态文件存储。 + echo "Dependencies installed." + echo "Building project..." + pnpm build --filter ${{ matrix.project }} + echo "Project built." From f5b2f759927ac3cbe711686d0fc515d48120bf64 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 16:47:00 +0800 Subject: [PATCH 32/58] ssh --- .gitea/workflows/build-action.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index ca3a990f..be83da7d 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -57,3 +57,20 @@ jobs: echo "Building project..." pnpm build --filter ${{ matrix.project }} echo "Project built." + + - name: Transfer files to target server + run: | + echo "Transferring files..." + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r pansoft-plrl/apps/dist/* root@172.19.183.27:/opt/pansoft + echo "Files transferred." + + - name: Execute remote commands + run: | + echo "Executing remote commands..." + sshpass -p "zx123123" ssh -o StrictHostKeyChecking=no root@172.19.183.27 << 'EOF' + echo "Removing old files..." + rm -rf /opt/pansoft/* + echo "Old files removed." + mv /opt/pansoft/dist/* /opt/pansoft/ + echo "Deployment complete." + EOF From 33d37ebfe5eda1bcb522fe0fa0315a69f3c30d81 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 18:54:41 +0800 Subject: [PATCH 33/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index be83da7d..7ff5f505 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -15,10 +15,10 @@ jobs: steps: - - name: Install Git - run: | - apt-get update - apt-get install -y git + # - name: Install Git + # run: | + # apt-get update + # apt-get install -y git - name: Output Node.js and npm version run: | @@ -48,20 +48,20 @@ jobs: npm install -g pnpm echo "pnpm installed." - - name: Install dependencies and build - run: | - cd pansoft-plrl - echo "Installing dependencies..." - pnpm install --no-frozen-lockfile - echo "Dependencies installed." - echo "Building project..." - pnpm build --filter ${{ matrix.project }} - echo "Project built." + # - name: Install dependencies and build + # run: | + # cd pansoft-plrl + # echo "Installing dependencies..." + # pnpm install --no-frozen-lockfile + # echo "Dependencies installed." + # echo "Building project..." + # pnpm build --filter ${{ matrix.project }} + # echo "Project built." - name: Transfer files to target server run: | echo "Transferring files..." - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r pansoft-plrl/apps/dist/* root@172.19.183.27:/opt/pansoft + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r pansoft-plrl/apps/* root@172.19.183.27:/opt/pansoft echo "Files transferred." - name: Execute remote commands From ac43d2fc1b2ad8b167062f3597bd3f54dc45875c Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:03:22 +0800 Subject: [PATCH 34/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 7ff5f505..c0b6d99a 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -48,20 +48,21 @@ jobs: npm install -g pnpm echo "pnpm installed." - # - name: Install dependencies and build - # run: | - # cd pansoft-plrl - # echo "Installing dependencies..." - # pnpm install --no-frozen-lockfile - # echo "Dependencies installed." - # echo "Building project..." - # pnpm build --filter ${{ matrix.project }} - # echo "Project built." + - name: Install dependencies and build + run: | + cd pansoft-plrl + echo "Installing dependencies..." + pnpm install --no-frozen-lockfile + echo "Dependencies installed." + echo "Building project..." + pnpm build --filter ${{ matrix.project }} + echo "Project built." - name: Transfer files to target server run: | echo "Transferring files..." - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r pansoft-plrl/apps/* root@172.19.183.27:/opt/pansoft + cd pansoft-plrl + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r apps/${{ matrix.project }}/dist.zip root@172.19.183.27:/opt/pansoft echo "Files transferred." - name: Execute remote commands From 634c8c7b32f5c38d203673b133e4457e16587d72 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:09:29 +0800 Subject: [PATCH 35/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index c0b6d99a..66d1cda8 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -62,7 +62,9 @@ jobs: run: | echo "Transferring files..." cd pansoft-plrl - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r apps/${{ matrix.project }}/dist.zip root@172.19.183.27:/opt/pansoft + echo "Local files in the directory:" + ls + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r ./apps/${{ matrix.project }}/dist.zip root@172.19.183.27:/opt/pansoft echo "Files transferred." - name: Execute remote commands From 6b65ce3c8bdacc70124042558343343f0ef37343 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:27:44 +0800 Subject: [PATCH 36/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 31 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 66d1cda8..6f9716dc 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -15,18 +15,15 @@ jobs: steps: - # - name: Install Git - # run: | - # apt-get update - # apt-get install -y git - + # Output Node.js and npm version - name: Output Node.js and npm version run: | echo "Node.js version:" node -v echo "npm version:" npm -v - + + # Clone repository - name: Clone repository run: | echo "Cloning repository..." @@ -35,6 +32,7 @@ jobs: git checkout test echo "Repository cloned and checked out to test branch." + # Set NPM registry - name: Set NPM registry run: | echo "Setting NPM registry..." @@ -48,25 +46,38 @@ jobs: npm install -g pnpm echo "pnpm installed." + # Cache pnpm dependencies + - name: Cache pnpm store + uses: actions/cache@v3 + id: pnpm-cache + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + + # Install dependencies and build - name: Install dependencies and build run: | cd pansoft-plrl echo "Installing dependencies..." - pnpm install --no-frozen-lockfile + pnpm install echo "Dependencies installed." echo "Building project..." pnpm build --filter ${{ matrix.project }} echo "Project built." - + + # Transfer files to target server - name: Transfer files to target server run: | echo "Transferring files..." cd pansoft-plrl echo "Local files in the directory:" ls - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r ./apps/${{ matrix.project }}/dist.zip root@172.19.183.27:/opt/pansoft + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r ./apps/web-office/dist.zip root@172.19.183.27:/opt/pansoft echo "Files transferred." + # Execute remote commands - name: Execute remote commands run: | echo "Executing remote commands..." @@ -76,4 +87,4 @@ jobs: echo "Old files removed." mv /opt/pansoft/dist/* /opt/pansoft/ echo "Deployment complete." - EOF + EOF \ No newline at end of file From 394e5e88b2c66abafdd643480ca01626c282255a Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:29:32 +0800 Subject: [PATCH 37/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 6f9716dc..d6d47473 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -48,7 +48,7 @@ jobs: # Cache pnpm dependencies - name: Cache pnpm store - uses: actions/cache@v3 + uses: https://gitea.com/actions/cache@v3 id: pnpm-cache with: path: ~/.pnpm-store From 83b30748e41fd957be02307bf62d5c736c2ae163 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:35:14 +0800 Subject: [PATCH 38/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index d6d47473..5aae3d12 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -61,7 +61,7 @@ jobs: run: | cd pansoft-plrl echo "Installing dependencies..." - pnpm install + pnpm install --no-frozen-lockfile echo "Dependencies installed." echo "Building project..." pnpm build --filter ${{ matrix.project }} From 99bbd685a464b26cfb0f9708a737cd88dca07265 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:40:58 +0800 Subject: [PATCH 39/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 5aae3d12..c0913c41 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -71,10 +71,10 @@ jobs: - name: Transfer files to target server run: | echo "Transferring files..." - cd pansoft-plrl + cd pansoft-plrl/apps echo "Local files in the directory:" ls - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r ./apps/web-office/dist.zip root@172.19.183.27:/opt/pansoft + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r web-office/dist.zip root@172.19.183.27:/opt/pansoft echo "Files transferred." # Execute remote commands From c8f5c8ab532f6ead1ae0e00fc5e961c207c339a9 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:51:08 +0800 Subject: [PATCH 40/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index c0913c41..8584fa7e 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -71,10 +71,10 @@ jobs: - name: Transfer files to target server run: | echo "Transferring files..." - cd pansoft-plrl/apps + cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r web-office/dist.zip root@172.19.183.27:/opt/pansoft + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r /workspace/z9130/pansoft-plrl/pansoft-plrl/apps/web-office/dist.zip root@172.19.183.27:/opt/pansoft echo "Files transferred." # Execute remote commands From be290257062926fdb04f002bf8315966efc50e0e Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:55:01 +0800 Subject: [PATCH 41/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 8584fa7e..98f00a6a 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -56,16 +56,16 @@ jobs: restore-keys: | ${{ runner.os }}-pnpm-store- - # Install dependencies and build - - name: Install dependencies and build - run: | - cd pansoft-plrl - echo "Installing dependencies..." - pnpm install --no-frozen-lockfile - echo "Dependencies installed." - echo "Building project..." - pnpm build --filter ${{ matrix.project }} - echo "Project built." + # # Install dependencies and build + # - name: Install dependencies and build + # run: | + # cd pansoft-plrl + # echo "Installing dependencies..." + # pnpm install --no-frozen-lockfile + # echo "Dependencies installed." + # echo "Building project..." + # pnpm build --filter ${{ matrix.project }} + # echo "Project built." # Transfer files to target server - name: Transfer files to target server @@ -74,7 +74,7 @@ jobs: cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r /workspace/z9130/pansoft-plrl/pansoft-plrl/apps/web-office/dist.zip root@172.19.183.27:/opt/pansoft + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r dist.zip root@172.19.183.27:/opt/pansoft echo "Files transferred." # Execute remote commands From 2af44beee1fd7ffe706295a2589dd1c066689c98 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Mon, 16 Sep 2024 19:55:28 +0800 Subject: [PATCH 42/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 98f00a6a..304e02f7 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -74,7 +74,7 @@ jobs: cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r dist.zip root@172.19.183.27:/opt/pansoft + sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r index.html root@172.19.183.27:/opt/pansoft echo "Files transferred." # Execute remote commands From dfb685a4b3df0d78d0bb56977dd311689d51b497 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 11:30:30 +0800 Subject: [PATCH 43/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 304e02f7..dcb19c50 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -74,17 +74,18 @@ jobs: cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - sshpass -p "zxs123123" scp -o StrictHostKeyChecking=no -r index.html root@172.19.183.27:/opt/pansoft + rsync -av --delete -e "ssh -p ${{ vars.REMOTE_PORT }}" /opt/dockerfile/ ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test + scp -o StrictHostKeyChecking=no -r index.html root@9.107.158.16:/opt/pansoft echo "Files transferred." # Execute remote commands - - name: Execute remote commands - run: | - echo "Executing remote commands..." - sshpass -p "zx123123" ssh -o StrictHostKeyChecking=no root@172.19.183.27 << 'EOF' - echo "Removing old files..." - rm -rf /opt/pansoft/* - echo "Old files removed." - mv /opt/pansoft/dist/* /opt/pansoft/ - echo "Deployment complete." - EOF \ No newline at end of file + # - name: Execute remote commands + # run: | + # echo "Executing remote commands..." + # sshpass -p "zx123123" ssh -o StrictHostKeyChecking=no root@172.19.183.27 << 'EOF' + # echo "Removing old files..." + # rm -rf /opt/pansoft/* + # echo "Old files removed." + # mv /opt/pansoft/dist/* /opt/pansoft/ + # echo "Deployment complete." + # EOF \ No newline at end of file From 482544aceb86f334bcd57abed6b957700b7422b6 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 11:35:51 +0800 Subject: [PATCH 44/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index dcb19c50..21dd57af 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -32,20 +32,6 @@ jobs: git checkout test echo "Repository cloned and checked out to test branch." - # Set NPM registry - - name: Set NPM registry - run: | - echo "Setting NPM registry..." - npm config set registry https://registry.npmmirror.com - echo "NPM registry set." - - # Install pnpm - - name: Install pnpm - run: | - echo "Installing pnpm..." - npm install -g pnpm - echo "pnpm installed." - # Cache pnpm dependencies - name: Cache pnpm store uses: https://gitea.com/actions/cache@v3 From 4aa97b39e4fe50e6eb8dbc9c781914d292d967dc Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 11:55:34 +0800 Subject: [PATCH 45/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 21dd57af..c50330d7 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -57,6 +57,9 @@ jobs: - name: Transfer files to target server run: | echo "Transferring files..." + mkdir -p ~/.ssh + echo "${{ vars.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls From 631d63ed1adbcab537bcbbb8964b3662de88ad9e Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 11:58:23 +0800 Subject: [PATCH 46/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index c50330d7..d0123398 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -63,8 +63,8 @@ jobs: cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - rsync -av --delete -e "ssh -p ${{ vars.REMOTE_PORT }}" /opt/dockerfile/ ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test - scp -o StrictHostKeyChecking=no -r index.html root@9.107.158.16:/opt/pansoft + rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" . ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test + # scp -o StrictHostKeyChecking=no -r index.html root@9.107.158.16:/opt/pansoft echo "Files transferred." # Execute remote commands From 9d7e3be2de51e194eaa57e7eb82062007a01166b Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 11:59:04 +0800 Subject: [PATCH 47/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index d0123398..67b8b7b2 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -63,8 +63,7 @@ jobs: cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" . ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test - # scp -o StrictHostKeyChecking=no -r index.html root@9.107.158.16:/opt/pansoft + rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" index.html ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test echo "Files transferred." # Execute remote commands From 4593e2617bd25e24fd2605be1884b421a517f5eb Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:12:18 +0800 Subject: [PATCH 48/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 55 +++++++++++++++++++----------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 67b8b7b2..1bee558f 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -13,15 +13,31 @@ jobs: matrix: project: [web-office] + before_script: + - corepack enable + - corepack prepare pnpm@latest-9 --activate + - pnpm config set store-dir .pnpm-store + script: + - pnpm install + cache: + paths: + - .pnpm-store + steps: # Output Node.js and npm version - name: Output Node.js and npm version run: | + echo "Node.js version:" node -v echo "npm version:" npm -v + corepack enable + corepack prepare pnpm@latest-9 --activate + pnpm config set store-dir ~/.pnpm-store + echo "pnpm version:" + pnpm -v # Clone repository - name: Clone repository @@ -32,26 +48,27 @@ jobs: git checkout test echo "Repository cloned and checked out to test branch." - # Cache pnpm dependencies - - name: Cache pnpm store - uses: https://gitea.com/actions/cache@v3 - id: pnpm-cache - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + # # Cache pnpm dependencies + # - name: Cache pnpm store + # uses: https://gitea.com/actions/cache@v3 + # id: pnpm-cache + # with: + # path: ~/.pnpm-store + # key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} + # restore-keys: | + # ${{ runner.os }}-pnpm-store- - # # Install dependencies and build - # - name: Install dependencies and build - # run: | - # cd pansoft-plrl - # echo "Installing dependencies..." - # pnpm install --no-frozen-lockfile - # echo "Dependencies installed." - # echo "Building project..." - # pnpm build --filter ${{ matrix.project }} - # echo "Project built." + # Install dependencies and build + - name: Install dependencies and build + run: | + pnpm config set store-dir ~/.pnpm-store + cd pansoft-plrl + echo "Installing dependencies..." + pnpm install --no-frozen-lockfile + echo "Dependencies installed." + echo "Building project..." + pnpm build --filter ${{ matrix.project }} + echo "Project built." # Transfer files to target server - name: Transfer files to target server From 89547bde2a413c70570e1b11b288137af7a6cbee Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:12:46 +0800 Subject: [PATCH 49/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 1bee558f..d1643457 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -13,15 +13,15 @@ jobs: matrix: project: [web-office] - before_script: - - corepack enable - - corepack prepare pnpm@latest-9 --activate - - pnpm config set store-dir .pnpm-store - script: - - pnpm install - cache: - paths: - - .pnpm-store + before_script: + - corepack enable + - corepack prepare pnpm@latest-9 --activate + - pnpm config set store-dir .pnpm-store + script: + - pnpm install + cache: + paths: + - .pnpm-store steps: From a6ca6e348f1664148902314820e21ee20452e8f0 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:13:18 +0800 Subject: [PATCH 50/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index d1643457..b55677b7 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -61,7 +61,6 @@ jobs: # Install dependencies and build - name: Install dependencies and build run: | - pnpm config set store-dir ~/.pnpm-store cd pansoft-plrl echo "Installing dependencies..." pnpm install --no-frozen-lockfile From 89a3537d24ec46c1f9a8af17648c946b03fa0970 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:18:53 +0800 Subject: [PATCH 51/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index b55677b7..095ff2b2 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -12,30 +12,19 @@ jobs: strategy: matrix: project: [web-office] - - before_script: - - corepack enable - - corepack prepare pnpm@latest-9 --activate - - pnpm config set store-dir .pnpm-store - script: - - pnpm install - cache: - paths: - - .pnpm-store steps: # Output Node.js and npm version - name: Output Node.js and npm version run: | - echo "Node.js version:" node -v echo "npm version:" npm -v corepack enable corepack prepare pnpm@latest-9 --activate - pnpm config set store-dir ~/.pnpm-store + pnpm config set store-dir .pnpm-store echo "pnpm version:" pnpm -v From 8bfcca45fd2c08a879ba7425b1752aed2dd3a790 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:26:19 +0800 Subject: [PATCH 52/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 095ff2b2..b917ad14 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -37,15 +37,15 @@ jobs: git checkout test echo "Repository cloned and checked out to test branch." - # # Cache pnpm dependencies - # - name: Cache pnpm store - # uses: https://gitea.com/actions/cache@v3 - # id: pnpm-cache - # with: - # path: ~/.pnpm-store - # key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} - # restore-keys: | - # ${{ runner.os }}-pnpm-store- + # Cache pnpm dependencies + - name: Cache pnpm store + uses: https://gitea.com/actions/cache@v3 + id: pnpm-cache + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- # Install dependencies and build - name: Install dependencies and build @@ -68,7 +68,7 @@ jobs: cd pansoft-plrl/apps/web-office echo "Local files in the directory:" ls - rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" index.html ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test + rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" dist/ ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test echo "Files transferred." # Execute remote commands From 950c18df0ff5f405a1934ffb835f6e3c4b619b9f Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:29:34 +0800 Subject: [PATCH 53/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index b917ad14..a3b15bc3 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -37,15 +37,15 @@ jobs: git checkout test echo "Repository cloned and checked out to test branch." - # Cache pnpm dependencies + # Cache pnpm dependencies - name: Cache pnpm store - uses: https://gitea.com/actions/cache@v3 + uses: actions/cache@v3 id: pnpm-cache with: - path: ~/.pnpm-store + path: .pnpm-store key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} restore-keys: | - ${{ runner.os }}-pnpm-store- + ${{ runner.os }}-pnpm-store- # Install dependencies and build - name: Install dependencies and build From b038d9e55b91d80732e8f0cd3442b800f188b18d Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:37:15 +0800 Subject: [PATCH 54/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index a3b15bc3..23ff87b2 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -30,22 +30,17 @@ jobs: # Clone repository - name: Clone repository - run: | - echo "Cloning repository..." - git clone http://172.19.183.27:3000/z9130/pansoft-plrl.git pansoft-plrl --depth 1 - cd pansoft-plrl - git checkout test - echo "Repository cloned and checked out to test branch." + uses: https://gitea.com/actions/checkout@v4 # Cache pnpm dependencies - name: Cache pnpm store - uses: actions/cache@v3 + uses: https://gitea.com/actions/cache@v3 id: pnpm-cache with: path: .pnpm-store key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} restore-keys: | - ${{ runner.os }}-pnpm-store- + ${{ runner.os }}-pnpm-store- # Install dependencies and build - name: Install dependencies and build From 56562837a2a8fe99868debe760c30a4ef2bd9572 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:38:21 +0800 Subject: [PATCH 55/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 23ff87b2..f325efc3 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -45,7 +45,8 @@ jobs: # Install dependencies and build - name: Install dependencies and build run: | - cd pansoft-plrl + # cd pansoft-plrl + ls echo "Installing dependencies..." pnpm install --no-frozen-lockfile echo "Dependencies installed." From b09fee9a28dc09d104e2ce56e2a74fa573bdc9c7 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:38:30 +0800 Subject: [PATCH 56/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index f325efc3..20f7284b 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -45,7 +45,6 @@ jobs: # Install dependencies and build - name: Install dependencies and build run: | - # cd pansoft-plrl ls echo "Installing dependencies..." pnpm install --no-frozen-lockfile From 3b0652f5fd7e982c2ab849e4c020b77a73ebf4ae Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:41:01 +0800 Subject: [PATCH 57/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index 20f7284b..c8fd9d20 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -38,7 +38,7 @@ jobs: id: pnpm-cache with: path: .pnpm-store - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pansoft-plrl/pnpm-lock.yaml') }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-pnpm-store- @@ -60,7 +60,7 @@ jobs: mkdir -p ~/.ssh echo "${{ vars.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - cd pansoft-plrl/apps/web-office + cd apps/web-office echo "Local files in the directory:" ls rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" dist/ ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test From 9182e8850b642fd7f34343e1e8d3c28c8ebc3484 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Tue, 17 Sep 2024 12:50:18 +0800 Subject: [PATCH 58/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/bui?= =?UTF-8?q?ld-action.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-action.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitea/workflows/build-action.yaml b/.gitea/workflows/build-action.yaml index c8fd9d20..5f19e422 100644 --- a/.gitea/workflows/build-action.yaml +++ b/.gitea/workflows/build-action.yaml @@ -65,15 +65,4 @@ jobs: ls rsync -av --delete -e "ssh -o StrictHostKeyChecking=no -p ${{ vars.REMOTE_PORT }}" dist/ ${{ vars.REMOTE_USER }}@${{ vars.REMOTE_HOST }}:/opt/test echo "Files transferred." - - # Execute remote commands - # - name: Execute remote commands - # run: | - # echo "Executing remote commands..." - # sshpass -p "zx123123" ssh -o StrictHostKeyChecking=no root@172.19.183.27 << 'EOF' - # echo "Removing old files..." - # rm -rf /opt/pansoft/* - # echo "Old files removed." - # mv /opt/pansoft/dist/* /opt/pansoft/ - # echo "Deployment complete." - # EOF \ No newline at end of file + \ No newline at end of file