From 6fc6610fe1ea8c07cadbc102c402bdc31dd973de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 16:00:28 +0800
Subject: [PATCH 1/9] Update cd.yml
---
.github/workflows/cd.yml | 105 ++++++++++++++++++++++++++++++---------
1 file changed, 82 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index e8e7162..7bedea4 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,14 +1,16 @@
name: CD
+
on:
- # 以主干的push事件作为触发条件
push:
- branches: main
+ branches:
+ - main
+ - dev
jobs:
- CD:
+ deploy-main:
+ if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
-
- name: Checkout repository
uses: actions/checkout@v2
@@ -32,29 +34,22 @@ jobs:
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: pnpm install
- # 从 package.json 里获取 version 属性的值
- # 在 CD Workflow 中会给每个生成的制品打上标签，而标签取值于 version 值
- name: Read Version
- # 读取出来的值会放在 steps.[id].outputs.value 供其他步骤 step 读取
id: version
uses: ashley-taylor/read-json-property-action@v1.0
with:
path: ./package.json
property: version
- # 打包生成制品，且把制品压缩到 assets.zip 压缩包里
- name: Building
run: |
pnpm build-only
zip -r assets ./dist/**
- # 基于当前 commit 进行版本发布 (Create a release)，tag_name 是 v 前缀加上 package.json 的 version 值
- name: Create GitHub Release
- # 此步骤中，版本发布后会返回对应的 url，以供下面上传制品的步骤中读取使用
id: create_release
uses: actions/create-release@v1
env:
- # GITHUB_TOKEN 是准备工作步骤三申请的 Personal Access Token
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
with:
tag_name: v${{ steps.version.outputs.value }}
@@ -62,7 +57,6 @@ jobs:
draft: false
prerelease: false
- # 把 assets.zip 上传到仓库对应的发布版本 Release 上
- name: Update Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
@@ -74,19 +68,84 @@ jobs:
asset_name: assets.zip
asset_content_type: application/zip
+ - name: Upload to Deploy Server (Main)
+ uses: easingthemes/ssh-deploy@v2.0.7
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_TOKEN_MAIN }}
+ SOURCE: "dist/"
+ TARGET: "/www/jh-questionnaire"
+ ARGS: "-avzr --delete"
+ REMOTE_HOST: ${{ secrets.REMOTE_HOST_MAIN }}
+ REMOTE_USER: ${{ secrets.REMOTE_USER_MAIN }}
+ PORT: "10022"
+
+ deploy-dev:
+ if: github.ref == 'refs/heads/dev'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ - name: Use Node.js
+ uses: actions/setup-node@v3
+ with:
+ node-version: "18.x"
+
+ - name: Install pnpm
+ run: npm install -g pnpm
+
+ - name: Cache
+ id: cache-dependencies
+ uses: actions/cache@v3
+ with:
+ path: |
+ **/node_modules
+ key: ${{ runner.OS }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+
+ - name: Installing Dependencies
+ if: steps.cache-dependencies.outputs.cache-hit != 'true'
+ run: pnpm install
+
+ - name: Read Version
+ id: version
+ uses: ashley-taylor/read-json-property-action@v1.0
+ with:
+ path: ./package.json
+ property: version
+
+ - name: Building
+ run: |
+ pnpm build-only
+ zip -r assets ./dist/**
+
+ - name: Create GitHub Release
+ id: create_release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+ with:
+ tag_name: v${{ steps.version.outputs.value }}
+ release_name: v${{ steps.version.outputs.value }}
+ draft: false
+ prerelease: false
+
+ - name: Update Release Asset
+ id: upload-release-asset
+ uses: actions/upload-release-asset@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: ./assets.zip
+ asset_name: assets.zip
+ asset_content_type: application/zip
- - name: Upload to Deploy Server
+ - name: Upload to Deploy Server (Dev)
uses: easingthemes/ssh-deploy@v2.0.7
env:
- # SSH_PRIVATE_KEY 为准备工作步骤三中生成密钥对里的私钥
- SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_TOKEN }}
- # 指定当前目录中要上传的内容
+ SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_TOKEN_DEV }}
SOURCE: "dist/"
- # 指定上传到部署机器的目录
- TARGET: "/var/www/dist"
- # 上传前指令，此处用c于清空 TARGET 下的文件
+ TARGET: "/front"
ARGS: "-avzr --delete"
- # REMOTE_HOST 为机器的公网IP
- REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
- # REMOTE_USER 为登录机器时用到的账号名
- REMOTE_USER: ${{ secrets.REMOTE_USER }}
+ REMOTE_HOST: ${{ secrets.REMOTE_HOST_DEV }}
+ REMOTE_USER: ${{ secrets.REMOTE_USER_DEV }}
From ead3a5bfe37e90941a2b8846e7b1feb6bc6673cf Mon Sep 17 00:00:00 2001
From: RosyrRais <145672957+RosyrRais@users.noreply.github.com>
Date: Fri, 30 Aug 2024 16:01:08 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=83=8C?=
=?UTF-8?q?=E6=99=AF=E8=89=B2=E6=BA=A2=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=20(#59)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* feat(dataDisplay): 增加了搜索和近期筛选功能
* fix(apis): 修改为代理
* chore&pref(dataDisplay): 重构了dataDisplay 分为了三个组件 让统计百分比显示后两位 在统计时不显示搜索和近期
* feat(dataDisplay): 增加了题类型
* fix(DataDisplay): 修复了背景色溢出的问题
---
src/pages/DataDisplay/statics.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/DataDisplay/statics.vue b/src/pages/DataDisplay/statics.vue
index 0770c72..a33e4be 100644
--- a/src/pages/DataDisplay/statics.vue
+++ b/src/pages/DataDisplay/statics.vue
@@ -5,9 +5,9 @@
{{ obj.serial_num }}. {{ obj.question }}
+
{{ opt.content }}
{{ (opt.count/totalNum*100).toFixed(2) }}%
-
From 4b691f604071598fc6bb814c9fe0085c95bd30cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 16:04:31 +0800
Subject: [PATCH 3/9] Update package.json
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index acf3649..ec0f663 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "text-ci",
- "version": "0.1.6",
+ "version": "0.1.8",
"private": true,
"type": "module",
"scripts": {
From e243a10a5b5a03620901d312e44e1a005addb819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:48:22 +0800
Subject: [PATCH 4/9] Update cd.yml
---
.github/workflows/cd.yml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 7bedea4..36ba5d4 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -106,29 +106,11 @@ jobs:
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: pnpm install
- - name: Read Version
- id: version
- uses: ashley-taylor/read-json-property-action@v1.0
- with:
- path: ./package.json
- property: version
-
- name: Building
run: |
pnpm build-only
zip -r assets ./dist/**
- - name: Create GitHub Release
- id: create_release
- uses: actions/create-release@v1
- env:
- GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
- with:
- tag_name: v${{ steps.version.outputs.value }}
- release_name: v${{ steps.version.outputs.value }}
- draft: false
- prerelease: false
-
- name: Update Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
From 3ee47cff1211028f05ac76676741983b2453b192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:49:42 +0800
Subject: [PATCH 5/9] Update cd.yml
---
.github/workflows/cd.yml | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 36ba5d4..1480c0d 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -111,17 +111,6 @@ jobs:
pnpm build-only
zip -r assets ./dist/**
- - name: Update Release Asset
- id: upload-release-asset
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./assets.zip
- asset_name: assets.zip
- asset_content_type: application/zip
-
- name: Upload to Deploy Server (Dev)
uses: easingthemes/ssh-deploy@v2.0.7
env:
From 1effaad9273778f7c9a7270371bd4af86691b13b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:52:37 +0800
Subject: [PATCH 6/9] Update cd.yml
---
.github/workflows/cd.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 1480c0d..7428acd 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -94,6 +94,7 @@ jobs:
- name: Install pnpm
run: npm install -g pnpm
+
- name: Cache
id: cache-dependencies
uses: actions/cache@v3
From 4fdecc3d1b8a430a99c432d72930a8fdc93231b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:56:28 +0800
Subject: [PATCH 7/9] Update cd.yml
---
.github/workflows/cd.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 7428acd..1480c0d 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -94,7 +94,6 @@ jobs:
- name: Install pnpm
run: npm install -g pnpm
-
- name: Cache
id: cache-dependencies
uses: actions/cache@v3
From 0979adaf66cc9ccfb0bbe963601a9eef46baa93b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:07:27 +0800
Subject: [PATCH 8/9] Update cd.yml
---
.github/workflows/cd.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 1480c0d..63c8d33 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -116,7 +116,7 @@ jobs:
env:
SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_TOKEN_DEV }}
SOURCE: "dist/"
- TARGET: "/front"
+ TARGET: "/home/github-action-xsx/front"
ARGS: "-avzr --delete"
REMOTE_HOST: ${{ secrets.REMOTE_HOST_DEV }}
REMOTE_USER: ${{ secrets.REMOTE_USER_DEV }}
From 1e9d83b821aa5f0516cd6865b3a22de31e4a8e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
<144224541+xixiIBN5100@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:13:13 +0800
Subject: [PATCH 9/9] Update cd.yml
---
.github/workflows/cd.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 63c8d33..a83006c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -110,7 +110,7 @@ jobs:
run: |
pnpm build-only
zip -r assets ./dist/**
-
+
- name: Upload to Deploy Server (Dev)
uses: easingthemes/ssh-deploy@v2.0.7
env: