diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a42aa13..121408e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -59,7 +59,7 @@ jobs: git config --local user.email "321200875@qq.com" git config --local user.name "kailong321200875" - - name: Build + - name: Build Gitee run: | yarn install yarn run build:gitee @@ -72,6 +72,31 @@ jobs: publish_dir: ./dist-pro force_orphan: true + - 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 Github + run: | + yarn run build:pro + + - name: Deploy + 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: Sync Github Repos To Gitee # 名字随便起 uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action with: @@ -85,16 +110,3 @@ jobs: force_update: true # 启用后,强制同步,即强制覆盖目的端仓库 static_list: 'vue-element-plus-admin' # 静态同步列表,在此填写需要同步的仓库名称,可填写多个 timeout: '600s' # git超时设置,超时后会自动重试git操作 - - - name: Build - run: | - yarn run build:pro - - - name: Deploy - 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1d3e22..bd40469 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,4 +15,4 @@ jobs: token: ${{ secrets.TOKEN }} release-type: node package-name: standard-version - changelog-types: '[{"type": "workflow", "section":"Workflow", "hidden": false},{"type": "types", "section":"Types", "hidden": false},{"type": "revert", "section":"Reverts", "hidden": false},{"type": "feat", "section": "Features", "hidden": false},{"type": "fix", "section": "Bug Fixes", "hidden": false},{"type": "improvement", "section": "Feature Improvements", "hidden": false},{"type": "docs", "section":"Docs", "hidden": false},{"type": "style", "section":"Styling", "hidden": false},{"type": "refactor", "section":"Code Refactoring", "hidden": false},{"type": "perf", "section":"Performance Improvements", "hidden": false},{"type": "test", "section":"Tests", "hidden": false},{"type": "build", "section":"Build System", "hidden": false},{"type": "ci", "section":"CI", "hidden":false}]' + changelog-types: '[{"type": "workflow", "section":"Workflows", "hidden": false},{"type": "types", "section":"Types", "hidden": false},{"type": "revert", "section":"Reverts", "hidden": false},{"type": "feat", "section": "Features", "hidden": false},{"type": "fix", "section": "Bug Fixes", "hidden": false},{"type": "improvement", "section": "Feature Improvements", "hidden": false},{"type": "docs", "section":"Docs", "hidden": false},{"type": "style", "section":"Styling", "hidden": false},{"type": "refactor", "section":"Code Refactoring", "hidden": false},{"type": "perf", "section":"Performance Improvements", "hidden": false},{"type": "test", "section":"Tests", "hidden": false},{"type": "build", "section":"Build System", "hidden": false},{"type": "ci", "section":"CI", "hidden":false}]' diff --git a/CHANGELOG.md b/CHANGELOG.md index 616f894..0d3e8ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,9 @@ All notable changes to this project will be documented in this file. See [standa ### [1.1.1](https://github.com/kailong321200875/vue-element-plus-admin/compare/v1.1.0...v1.1.1) (2022-03-01) +### Workflows -### Workflow - -* update workflow ([085328a](https://github.com/kailong321200875/vue-element-plus-admin/commit/085328aba8c4f356bf7915a6bbdc1ec4f46ceeda)) +- update workflow ([085328a](https://github.com/kailong321200875/vue-element-plus-admin/commit/085328aba8c4f356bf7915a6bbdc1ec4f46ceeda)) ## [1.1.0](https://github.com/kailong321200875/vue-element-plus-admin/compare/v1.0.3...v1.1.0) (2022-03-01)