diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 697b5f4..2013b3b 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -17,7 +17,8 @@ on: status: {} jobs: - automerge: + # 合并发布版本的 pr 到 master + auto-merge: runs-on: ubuntu-latest steps: - name: Automerge @@ -27,25 +28,56 @@ jobs: MERGE_LABELS: '' MERGE_FILTER_AUTHOR: 'kailong321200875' + contrib-readme-en-job: + needs: [auto-merge] + runs-on: ubuntu-latest + name: A job to automate contrib in readme + steps: + - name: Contribute List + uses: akhilmhdh/contributors-readme-action@v2.3.4 + env: + GITHUB_TOKEN: ${{ secrets.CONTRIBUTORS_TOKEN }} + + contrib-readme-job: + needs: [auto-merge, contrib-readme-en-job] + runs-on: ubuntu-latest + name: A job to automate contrib in readme.zh-CN + steps: + - name: Contribute List + uses: akhilmhdh/contributors-readme-action@v2.3.4 + with: + readme_path: README.zh-CN.md + env: + GITHUB_TOKEN: ${{ secrets.CONTRIBUTORS_TOKEN }} + + push-to-gh-pages: + needs: [auto-merge] + runs-on: ubuntu-latest + steps: - name: Checkout uses: actions/checkout@v2 - - name: Use Node.js 16 + - 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: Get Yarn Cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn cache dir)" - - - name: Cache Dependencies - uses: actions/cache@v2 + - name: Cache ~/.pnpm-store + uses: actions/cache@v3 + env: + cache-name: cache-pnpm-store with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + path: ~/.pnpm-store + key: ${{ runner.os }}-${{ matrix.node-version }}-test-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | - ${{ runner.os }}-yarn- + ${{ runner.os }}-${{ matrix.node-version }}-test-${{ env.cache-name }}- + ${{ runner.os }}-${{ matrix.node-version }}-test- + ${{ runner.os }}- - name: Set SSH Environment env: @@ -59,12 +91,13 @@ jobs: git config --local user.email "321200875@qq.com" git config --local user.name "kailong321200875" + # 发布到github - name: Build Github run: | - yarn install - yarn run build:pro + pnpm install + pnpm run build:pro - - name: Deploy + - name: Deploy Github uses: peaceiris/actions-gh-pages@v3 with: deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} @@ -72,3 +105,72 @@ jobs: 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 + + - 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: Cache ~/.pnpm-store + uses: actions/cache@v3 + env: + cache-name: cache-pnpm-store + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-${{ matrix.node-version }}-test-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.node-version }}-test-${{ env.cache-name }}- + ${{ runner.os }}-${{ matrix.node-version }}-test- + ${{ runner.os }}- + + - 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 + 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 + + - 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/.github/workflows/deploy-gitee.yml b/.github/workflows/deploy-gitee.yml deleted file mode 100644 index be1c7d4..0000000 --- a/.github/workflows/deploy-gitee.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Deploy Gitee - -on: - push: - branches: - - master - -jobs: - push-to-gh-pages-gitee: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: use Node.js 16 - uses: actions/setup-node@v2.1.2 - with: - node-version: '16.x' - - - name: Get Yarn Cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn cache dir)" - - - name: Cache Dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - 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 - run: | - yarn install - yarn run build: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操作 diff --git a/.github/workflows/reademe-contributors-zh-CN.yml b/.github/workflows/reademe-contributors-zh-CN.yml deleted file mode 100644 index bf5f0e8..0000000 --- a/.github/workflows/reademe-contributors-zh-CN.yml +++ /dev/null @@ -1,16 +0,0 @@ -on: - push: - branches: - - master - -jobs: - contrib-readme-job: - runs-on: ubuntu-latest - name: A job to automate contrib in readme - steps: - - name: Contribute List - uses: akhilmhdh/contributors-readme-action@v2.3.4 - with: - readme_path: README.zh-CN.md - env: - GITHUB_TOKEN: ${{ secrets.ACTIONS_DEPLOY_KEY }} diff --git a/.github/workflows/reademe-contributors.yml b/.github/workflows/reademe-contributors.yml deleted file mode 100644 index 8aa092a..0000000 --- a/.github/workflows/reademe-contributors.yml +++ /dev/null @@ -1,14 +0,0 @@ -on: - push: - branches: - - master - -jobs: - contrib-readme-job: - runs-on: ubuntu-latest - name: A job to automate contrib in readme - steps: - - name: Contribute List - uses: akhilmhdh/contributors-readme-action@v2.3.4 - env: - GITHUB_TOKEN: ${{ secrets.ACTIONS_DEPLOY_KEY }}