Merge branch 'v2'
This commit is contained in:
kailong321200875
commit
fabda2da38
|
|
@ -1,131 +1,131 @@
|
||||||
name: Automerge
|
# name: Automerge
|
||||||
|
|
||||||
on:
|
# on:
|
||||||
pull_request:
|
# pull_request:
|
||||||
types:
|
# types:
|
||||||
- labeled
|
# - labeled
|
||||||
- unlabeled
|
# - unlabeled
|
||||||
- synchronize
|
# - synchronize
|
||||||
- opened
|
# - opened
|
||||||
- edited
|
# - edited
|
||||||
- ready_for_review
|
# - ready_for_review
|
||||||
- reopened
|
# - reopened
|
||||||
- unlocked
|
# - unlocked
|
||||||
pull_request_review:
|
# pull_request_review:
|
||||||
types:
|
# types:
|
||||||
- submitted
|
# - submitted
|
||||||
status: {}
|
# status: {}
|
||||||
|
|
||||||
jobs:
|
# jobs:
|
||||||
# 合并发布版本的 pr 到 master
|
# # 合并发布版本的 pr 到 master
|
||||||
auto-merge:
|
# auto-merge:
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
steps:
|
# steps:
|
||||||
- name: Automerge
|
# - name: Automerge
|
||||||
uses: 'pascalgn/automerge-action@v0.14.3'
|
# uses: 'pascalgn/automerge-action@v0.14.3'
|
||||||
env:
|
# env:
|
||||||
BASE_BRANCHES: 'release'
|
# BASE_BRANCHES: 'release'
|
||||||
GITHUB_TOKEN: '${{ secrets.TOKEN }}'
|
# GITHUB_TOKEN: '${{ secrets.TOKEN }}'
|
||||||
MERGE_LABELS: ''
|
# MERGE_LABELS: ''
|
||||||
MERGE_FILTER_AUTHOR: 'kailong321200875'
|
# MERGE_FILTER_AUTHOR: 'kailong321200875'
|
||||||
|
|
||||||
push-to-gh-pages:
|
# push-to-gh-pages:
|
||||||
needs: [auto-merge]
|
# needs: [auto-merge]
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
steps:
|
# steps:
|
||||||
- name: Checkout
|
# - name: Checkout
|
||||||
uses: actions/checkout@v2
|
# uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Setup Pnpm
|
# - name: Setup Pnpm
|
||||||
uses: pnpm/action-setup@v2
|
# uses: pnpm/action-setup@v2
|
||||||
with:
|
# with:
|
||||||
version: latest
|
# version: latest
|
||||||
|
|
||||||
- name: use Node.js 16
|
# - name: use Node.js 16
|
||||||
uses: actions/setup-node@v2.1.2
|
# uses: actions/setup-node@v2.1.2
|
||||||
with:
|
# with:
|
||||||
node-version: '16.x'
|
# node-version: '16.x'
|
||||||
|
|
||||||
- name: Set SSH Environment
|
# - name: Set SSH Environment
|
||||||
env:
|
# env:
|
||||||
DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
|
# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
|
||||||
run: |
|
# run: |
|
||||||
mkdir -p ~/.ssh/
|
# mkdir -p ~/.ssh/
|
||||||
echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
|
# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
|
||||||
chmod 600 ~/.ssh/id_rsa
|
# chmod 600 ~/.ssh/id_rsa
|
||||||
ssh-keyscan github.com > ~/.ssh/known_hosts
|
# ssh-keyscan github.com > ~/.ssh/known_hosts
|
||||||
chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
|
# chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
|
||||||
git config --local user.email "321200875@qq.com"
|
# git config --local user.email "321200875@qq.com"
|
||||||
git config --local user.name "kailong321200875"
|
# git config --local user.name "kailong321200875"
|
||||||
|
|
||||||
# 发布到 github
|
# # 发布到 github
|
||||||
- name: Build Github
|
# - name: Build Github
|
||||||
run: |
|
# run: |
|
||||||
pnpm install --no-frozen-lockfile
|
# pnpm install --no-frozen-lockfile
|
||||||
pnpm run build:pro
|
# pnpm run build:pro
|
||||||
|
|
||||||
- name: Deploy Github
|
# - name: Deploy Github
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
# uses: peaceiris/actions-gh-pages@v3
|
||||||
with:
|
# with:
|
||||||
deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
|
# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
|
||||||
publish_branch: gh-pages
|
# publish_branch: gh-pages
|
||||||
publish_dir: ./dist-pro
|
# publish_dir: ./dist-pro
|
||||||
force_orphan: true
|
# force_orphan: true
|
||||||
cname: element-plus-admin.cn
|
# cname: element-plus-admin.cn
|
||||||
|
|
||||||
push-to-gh-pages-gitee:
|
# push-to-gh-pages-gitee:
|
||||||
needs: [auto-merge]
|
# needs: [auto-merge]
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
steps:
|
# steps:
|
||||||
- name: Checkout
|
# - name: Checkout
|
||||||
uses: actions/checkout@v2
|
# uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Setup Pnpm
|
# - name: Setup Pnpm
|
||||||
uses: pnpm/action-setup@v2
|
# uses: pnpm/action-setup@v2
|
||||||
with:
|
# with:
|
||||||
version: latest
|
# version: latest
|
||||||
|
|
||||||
- name: use Node.js 16
|
# - name: use Node.js 16
|
||||||
uses: actions/setup-node@v2.1.2
|
# uses: actions/setup-node@v2.1.2
|
||||||
with:
|
# with:
|
||||||
node-version: '16.x'
|
# node-version: '16.x'
|
||||||
|
|
||||||
- name: Set SSH Environment
|
# - name: Set SSH Environment
|
||||||
env:
|
# env:
|
||||||
DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
|
# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
|
||||||
run: |
|
# run: |
|
||||||
mkdir -p ~/.ssh/
|
# mkdir -p ~/.ssh/
|
||||||
echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
|
# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
|
||||||
chmod 600 ~/.ssh/id_rsa
|
# chmod 600 ~/.ssh/id_rsa
|
||||||
ssh-keyscan github.com > ~/.ssh/known_hosts
|
# ssh-keyscan github.com > ~/.ssh/known_hosts
|
||||||
chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
|
# chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
|
||||||
git config --local user.email "321200875@qq.com"
|
# git config --local user.email "321200875@qq.com"
|
||||||
git config --local user.name "kailong321200875"
|
# git config --local user.name "kailong321200875"
|
||||||
|
|
||||||
- name: Build Gitee
|
# - name: Build Gitee
|
||||||
run: |
|
# run: |
|
||||||
pnpm install --no-frozen-lockfile
|
# pnpm install --no-frozen-lockfile
|
||||||
pnpm run build:gitee
|
# pnpm run build:gitee
|
||||||
|
|
||||||
# 发布到 gitee
|
# # 发布到 gitee
|
||||||
- name: Deploy Gitee
|
# - name: Deploy Gitee
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
# uses: peaceiris/actions-gh-pages@v3
|
||||||
with:
|
# with:
|
||||||
deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
|
# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
|
||||||
publish_branch: gh-pages-gitee
|
# publish_branch: gh-pages-gitee
|
||||||
publish_dir: ./dist-pro
|
# publish_dir: ./dist-pro
|
||||||
force_orphan: true
|
# force_orphan: true
|
||||||
|
|
||||||
- name: Sync Github Repos To Gitee # 名字随便起
|
# - name: Sync Github Repos To Gitee # 名字随便起
|
||||||
uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action
|
# uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action
|
||||||
with:
|
# with:
|
||||||
src: github/kailong321200875 # 源端账户名(github)
|
# src: github/kailong321200875 # 源端账户名(github)
|
||||||
dst: gitee/kailong110120130 # 目的端账户名(gitee)
|
# dst: gitee/kailong110120130 # 目的端账户名(gitee)
|
||||||
dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥
|
# dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥
|
||||||
dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌
|
# dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌
|
||||||
account_type: user # 账户类型
|
# account_type: user # 账户类型
|
||||||
clone_style: 'https' # 使用https方式进行clone，也可以使用ssh
|
# clone_style: 'https' # 使用https方式进行clone，也可以使用ssh
|
||||||
debug: true # 启用后会显示所有执行命令
|
# debug: true # 启用后会显示所有执行命令
|
||||||
force_update: true # 启用后，强制同步，即强制覆盖目的端仓库
|
# force_update: true # 启用后，强制同步，即强制覆盖目的端仓库
|
||||||
static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
|
# static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
|
||||||
timeout: '600s' # git超时设置，超时后会自动重试git操作
|
# timeout: '600s' # git超时设置，超时后会自动重试git操作
|
||||||
|
|
|
||||||
|
|
@ -567,25 +567,6 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/dynamic',
|
|
||||||
component: Layout,
|
|
||||||
redirect: '/404',
|
|
||||||
name: 'Dynamic',
|
|
||||||
meta: {
|
|
||||||
hidden: true
|
|
||||||
},
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
path: 'tab/:id',
|
|
||||||
component: () => import('@/components/Dynamic/src/Dynamic.vue'),
|
|
||||||
name: 'Dynamic',
|
|
||||||
meta: {
|
|
||||||
title: '详情页'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue