Skip to content

Commit 85f8cda

Browse files
kailong321200875kailong321200875
committed
refactor: 重构完成
1 parent 5d55597 commit 85f8cda

File tree

2 files changed

+117
-117
lines changed

2 files changed

+117
-117
lines changed

‎.github/workflows/auto-merge.yml

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,131 @@
1-
name: Automerge
1+
# name: Automerge
22

3-
on:
4-
pull_request:
5-
types:
6-
- labeled
7-
- unlabeled
8-
- synchronize
9-
- opened
10-
- edited
11-
- ready_for_review
12-
- reopened
13-
- unlocked
14-
pull_request_review:
15-
types:
16-
- submitted
17-
status: {}
3+
# on:
4+
# pull_request:
5+
# types:
6+
# - labeled
7+
# - unlabeled
8+
# - synchronize
9+
# - opened
10+
# - edited
11+
# - ready_for_review
12+
# - reopened
13+
# - unlocked
14+
# pull_request_review:
15+
# types:
16+
# - submitted
17+
# status: {}
1818

19-
jobs:
20-
# 合并发布版本的 pr 到 master
21-
auto-merge:
22-
runs-on: ubuntu-latest
23-
steps:
24-
- name: Automerge
25-
uses: 'pascalgn/[email protected]'
26-
env:
27-
BASE_BRANCHES: 'release'
28-
GITHUB_TOKEN: '${{ secrets.TOKEN }}'
29-
MERGE_LABELS: ''
30-
MERGE_FILTER_AUTHOR: 'kailong321200875'
19+
# jobs:
20+
# # 合并发布版本的 pr 到 master
21+
# auto-merge:
22+
# runs-on: ubuntu-latest
23+
# steps:
24+
# - name: Automerge
25+
# uses: 'pascalgn/[email protected]'
26+
# env:
27+
# BASE_BRANCHES: 'release'
28+
# GITHUB_TOKEN: '${{ secrets.TOKEN }}'
29+
# MERGE_LABELS: ''
30+
# MERGE_FILTER_AUTHOR: 'kailong321200875'
3131

32-
push-to-gh-pages:
33-
needs: [auto-merge]
34-
runs-on: ubuntu-latest
35-
steps:
36-
- name: Checkout
37-
uses: actions/checkout@v2
32+
# push-to-gh-pages:
33+
# needs: [auto-merge]
34+
# runs-on: ubuntu-latest
35+
# steps:
36+
# - name: Checkout
37+
# uses: actions/checkout@v2
3838

39-
- name: Setup Pnpm
40-
uses: pnpm/action-setup@v2
41-
with:
42-
version: latest
39+
# - name: Setup Pnpm
40+
# uses: pnpm/action-setup@v2
41+
# with:
42+
# version: latest
4343

44-
- name: use Node.js 16
45-
uses: actions/[email protected]
46-
with:
47-
node-version: '16.x'
44+
# - name: use Node.js 16
45+
# uses: actions/[email protected]
46+
# with:
47+
# node-version: '16.x'
4848

49-
- name: Set SSH Environment
50-
env:
51-
DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
52-
run: |
53-
mkdir -p ~/.ssh/
54-
echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
55-
chmod 600 ~/.ssh/id_rsa
56-
ssh-keyscan github.com > ~/.ssh/known_hosts
57-
chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
58-
git config --local user.email "[email protected]"
59-
git config --local user.name "kailong321200875"
49+
# - name: Set SSH Environment
50+
# env:
51+
# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
52+
# run: |
53+
# mkdir -p ~/.ssh/
54+
# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
55+
# chmod 600 ~/.ssh/id_rsa
56+
# ssh-keyscan github.com > ~/.ssh/known_hosts
57+
# chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
58+
# git config --local user.email "[email protected]"
59+
# git config --local user.name "kailong321200875"
6060

61-
# 发布到 github
62-
- name: Build Github
63-
run: |
64-
pnpm install --no-frozen-lockfile
65-
pnpm run build:pro
61+
# # 发布到 github
62+
# - name: Build Github
63+
# run: |
64+
# pnpm install --no-frozen-lockfile
65+
# pnpm run build:pro
6666

67-
- name: Deploy Github
68-
uses: peaceiris/actions-gh-pages@v3
69-
with:
70-
deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
71-
publish_branch: gh-pages
72-
publish_dir: ./dist-pro
73-
force_orphan: true
74-
cname: element-plus-admin.cn
67+
# - name: Deploy Github
68+
# uses: peaceiris/actions-gh-pages@v3
69+
# with:
70+
# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
71+
# publish_branch: gh-pages
72+
# publish_dir: ./dist-pro
73+
# force_orphan: true
74+
# cname: element-plus-admin.cn
7575

76-
push-to-gh-pages-gitee:
77-
needs: [auto-merge]
78-
runs-on: ubuntu-latest
79-
steps:
80-
- name: Checkout
81-
uses: actions/checkout@v2
76+
# push-to-gh-pages-gitee:
77+
# needs: [auto-merge]
78+
# runs-on: ubuntu-latest
79+
# steps:
80+
# - name: Checkout
81+
# uses: actions/checkout@v2
8282

83-
- name: Setup Pnpm
84-
uses: pnpm/action-setup@v2
85-
with:
86-
version: latest
83+
# - name: Setup Pnpm
84+
# uses: pnpm/action-setup@v2
85+
# with:
86+
# version: latest
8787

88-
- name: use Node.js 16
89-
uses: actions/[email protected]
90-
with:
91-
node-version: '16.x'
88+
# - name: use Node.js 16
89+
# uses: actions/[email protected]
90+
# with:
91+
# node-version: '16.x'
9292

93-
- name: Set SSH Environment
94-
env:
95-
DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
96-
run: |
97-
mkdir -p ~/.ssh/
98-
echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
99-
chmod 600 ~/.ssh/id_rsa
100-
ssh-keyscan github.com > ~/.ssh/known_hosts
101-
chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
102-
git config --local user.email "[email protected]"
103-
git config --local user.name "kailong321200875"
93+
# - name: Set SSH Environment
94+
# env:
95+
# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
96+
# run: |
97+
# mkdir -p ~/.ssh/
98+
# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
99+
# chmod 600 ~/.ssh/id_rsa
100+
# ssh-keyscan github.com > ~/.ssh/known_hosts
101+
# chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
102+
# git config --local user.email "[email protected]"
103+
# git config --local user.name "kailong321200875"
104104

105-
- name: Build Gitee
106-
run: |
107-
pnpm install --no-frozen-lockfile
108-
pnpm run build:gitee
105+
# - name: Build Gitee
106+
# run: |
107+
# pnpm install --no-frozen-lockfile
108+
# pnpm run build:gitee
109109

110-
# 发布到 gitee
111-
- name: Deploy Gitee
112-
uses: peaceiris/actions-gh-pages@v3
113-
with:
114-
deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
115-
publish_branch: gh-pages-gitee
116-
publish_dir: ./dist-pro
117-
force_orphan: true
110+
# # 发布到 gitee
111+
# - name: Deploy Gitee
112+
# uses: peaceiris/actions-gh-pages@v3
113+
# with:
114+
# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
115+
# publish_branch: gh-pages-gitee
116+
# publish_dir: ./dist-pro
117+
# force_orphan: true
118118

119-
- name: Sync Github Repos To Gitee # 名字随便起
120-
uses: Yikun/[email protected] # 使用Yikun/hub-mirror-action
121-
with:
122-
src: github/kailong321200875 # 源端账户名(github)
123-
dst: gitee/kailong110120130 # 目的端账户名(gitee)
124-
dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥
125-
dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌
126-
account_type: user # 账户类型
127-
clone_style: 'https' # 使用https方式进行clone，也可以使用ssh
128-
debug: true # 启用后会显示所有执行命令
129-
force_update: true # 启用后，强制同步，即强制覆盖目的端仓库
130-
static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
131-
timeout: '600s' # git超时设置，超时后会自动重试git操作
119+
# - name: Sync Github Repos To Gitee # 名字随便起
120+
# uses: Yikun/[email protected] # 使用Yikun/hub-mirror-action
121+
# with:
122+
# src: github/kailong321200875 # 源端账户名(github)
123+
# dst: gitee/kailong110120130 # 目的端账户名(gitee)
124+
# dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥
125+
# dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌
126+
# account_type: user # 账户类型
127+
# clone_style: 'https' # 使用https方式进行clone，也可以使用ssh
128+
# debug: true # 启用后会显示所有执行命令
129+
# force_update: true # 启用后，强制同步，即强制覆盖目的端仓库
130+
# static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
131+
# timeout: '600s' # git超时设置，超时后会自动重试git操作

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-element-plus-admin",
3-
"version": "2.0。0",
3+
"version": "1.9.9",
44
"description": "一套基于vue3、element-plus、typesScript、vite4的后台集成方案。",
55
"author": "Archer <[email protected]>",
66
"private": false,

0 commit comments

Comments
 (0)