From 85f8cda19d8cafb951f211b845aad970a661dd1e Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sun, 6 Aug 2023 11:34:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 232 +++++++++++++++---------------- package.json | 2 +- 2 files changed, 117 insertions(+), 117 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 5727846..b805d97 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,131 +1,131 @@ -name: Automerge +# name: Automerge -on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - status: {} +# on: +# pull_request: +# types: +# - labeled +# - unlabeled +# - synchronize +# - opened +# - edited +# - ready_for_review +# - reopened +# - unlocked +# pull_request_review: +# types: +# - submitted +# status: {} -jobs: - # 合并发布版本的 pr 到 master - auto-merge: - runs-on: ubuntu-latest - steps: - - name: Automerge - uses: 'pascalgn/automerge-action@v0.14.3' - env: - BASE_BRANCHES: 'release' - GITHUB_TOKEN: '${{ secrets.TOKEN }}' - MERGE_LABELS: '' - MERGE_FILTER_AUTHOR: 'kailong321200875' +# jobs: +# # 合并发布版本的 pr 到 master +# auto-merge: +# runs-on: ubuntu-latest +# steps: +# - name: Automerge +# uses: 'pascalgn/automerge-action@v0.14.3' +# env: +# BASE_BRANCHES: 'release' +# GITHUB_TOKEN: '${{ secrets.TOKEN }}' +# MERGE_LABELS: '' +# MERGE_FILTER_AUTHOR: 'kailong321200875' - push-to-gh-pages: - needs: [auto-merge] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 +# push-to-gh-pages: +# needs: [auto-merge] +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v2 - - name: Setup Pnpm - uses: pnpm/action-setup@v2 - with: - version: latest +# - name: Setup Pnpm +# uses: pnpm/action-setup@v2 +# with: +# version: latest - - name: use Node.js 16 - uses: actions/setup-node@v2.1.2 - with: - node-version: '16.x' +# - name: use Node.js 16 +# uses: actions/setup-node@v2.1.2 +# with: +# node-version: '16.x' - - name: Set SSH Environment - env: - DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - run: | - mkdir -p ~/.ssh/ - echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan github.com > ~/.ssh/known_hosts - chmod 700 ~/.ssh && chmod 600 ~/.ssh/* - git config --local user.email "321200875@qq.com" - git config --local user.name "kailong321200875" +# - name: Set SSH Environment +# env: +# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} +# run: | +# mkdir -p ~/.ssh/ +# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa +# chmod 600 ~/.ssh/id_rsa +# ssh-keyscan github.com > ~/.ssh/known_hosts +# chmod 700 ~/.ssh && chmod 600 ~/.ssh/* +# git config --local user.email "321200875@qq.com" +# git config --local user.name "kailong321200875" - # 发布到 github - - name: Build Github - run: | - pnpm install --no-frozen-lockfile - pnpm run build:pro +# # 发布到 github +# - name: Build Github +# run: | +# pnpm install --no-frozen-lockfile +# pnpm run build:pro - - name: Deploy Github - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} - publish_branch: gh-pages - publish_dir: ./dist-pro - force_orphan: true - cname: element-plus-admin.cn +# - name: Deploy Github +# uses: peaceiris/actions-gh-pages@v3 +# with: +# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} +# publish_branch: gh-pages +# publish_dir: ./dist-pro +# force_orphan: true +# cname: element-plus-admin.cn - push-to-gh-pages-gitee: - needs: [auto-merge] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 +# push-to-gh-pages-gitee: +# needs: [auto-merge] +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v2 - - name: Setup Pnpm - uses: pnpm/action-setup@v2 - with: - version: latest +# - name: Setup Pnpm +# uses: pnpm/action-setup@v2 +# with: +# version: latest - - name: use Node.js 16 - uses: actions/setup-node@v2.1.2 - with: - node-version: '16.x' +# - name: use Node.js 16 +# uses: actions/setup-node@v2.1.2 +# with: +# node-version: '16.x' - - name: Set SSH Environment - env: - DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - run: | - mkdir -p ~/.ssh/ - echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan github.com > ~/.ssh/known_hosts - chmod 700 ~/.ssh && chmod 600 ~/.ssh/* - git config --local user.email "321200875@qq.com" - git config --local user.name "kailong321200875" +# - name: Set SSH Environment +# env: +# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} +# run: | +# mkdir -p ~/.ssh/ +# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa +# chmod 600 ~/.ssh/id_rsa +# ssh-keyscan github.com > ~/.ssh/known_hosts +# chmod 700 ~/.ssh && chmod 600 ~/.ssh/* +# git config --local user.email "321200875@qq.com" +# git config --local user.name "kailong321200875" - - name: Build Gitee - run: | - pnpm install --no-frozen-lockfile - pnpm run build:gitee +# - name: Build Gitee +# run: | +# pnpm install --no-frozen-lockfile +# pnpm run build:gitee - # 发布到 gitee - - name: Deploy Gitee - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} - publish_branch: gh-pages-gitee - publish_dir: ./dist-pro - force_orphan: true +# # 发布到 gitee +# - name: Deploy Gitee +# uses: peaceiris/actions-gh-pages@v3 +# with: +# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} +# publish_branch: gh-pages-gitee +# publish_dir: ./dist-pro +# force_orphan: true - - name: Sync Github Repos To Gitee # 名字随便起 - uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action - with: - src: github/kailong321200875 # 源端账户名(github) - dst: gitee/kailong110120130 # 目的端账户名(gitee) - dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥 - dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌 - account_type: user # 账户类型 - clone_style: 'https' # 使用https方式进行clone，也可以使用ssh - debug: true # 启用后会显示所有执行命令 - force_update: true # 启用后，强制同步，即强制覆盖目的端仓库 - static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个 - timeout: '600s' # git超时设置，超时后会自动重试git操作 +# - name: Sync Github Repos To Gitee # 名字随便起 +# uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action +# with: +# src: github/kailong321200875 # 源端账户名(github) +# dst: gitee/kailong110120130 # 目的端账户名(gitee) +# dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥 +# dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌 +# account_type: user # 账户类型 +# clone_style: 'https' # 使用https方式进行clone，也可以使用ssh +# debug: true # 启用后会显示所有执行命令 +# force_update: true # 启用后，强制同步，即强制覆盖目的端仓库 +# static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个 +# timeout: '600s' # git超时设置，超时后会自动重试git操作 diff --git a/package.json b/package.json index bc28bcc..843c13d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "2.0。0", + "version": "1.9.9", "description": "一套基于vue3、element-plus、typesScript、vite4的后台集成方案。", "author": "Archer <502431556@qq.com>", "private": false,