diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f1f2cf14..aa7a4b64 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -4,13 +4,15 @@ on: push: branches: - master - - dev pull_request: jobs: test: name: Test Coverage runs-on: ${{ matrix.os }} + concurrency: + group: test-coverage-${{ github.ref }} + cancel-in-progress: true strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10"] diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 2739ad12..bf4cfbf1 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -14,6 +14,9 @@ jobs: update-release-draft: if: github.event_name == 'pull_request_target' runs-on: ubuntu-latest + concurrency: + group: pull-request-changelog + cancel-in-progress: true steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 9d6c3bd8..35a169ec 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -4,22 +4,20 @@ on: push: branches: - master - - dev pull_request_target: jobs: publish: + if: github.event_name == 'push' runs-on: ubuntu-latest + concurrency: + group: website-deploy-${{ github.ref }} + cancel-in-progress: true steps: - uses: actions/checkout@v2 if: github.event_name == 'push' - - uses: actions/checkout@v2 - if: github.event_name != 'push' - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Setup Python Environment uses: ./.github/actions/setup-python @@ -35,23 +33,53 @@ jobs: - name: Get Branch Name run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV - - name: Get Deploy Name - if: github.event_name == 'push' - run: | - echo "DEPLOY_NAME=${{ env.BRANCH_NAME }}" >> $GITHUB_ENV - echo "PRODUCTION=${{ env.BRANCH_NAME == 'master' }}" >> $GITHUB_ENV + - name: Deploy to Netlify + uses: nwtgck/actions-netlify@v1 + with: + publish-dir: "./website/build" + production-deploy: true + github-token: ${{ secrets.GITHUB_TOKEN }} + deploy-message: "Deploy ${{ env.BRANCH_NAME }}@${{ github.sha }}" + enable-commit-comment: false + alias: ${{ env.BRANCH_NAME }} + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.SITE_ID }} + + preview: + if: github.event_name == 'pull_request_target' + runs-on: ubuntu-latest + concurrency: + group: pull-request-preview-${{ github.event.number }} + cancel-in-progress: true + + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Setup Python Environment + uses: ./.github/actions/setup-python + + - name: Setup Node Environment + uses: ./.github/actions/setup-node + + - name: Build API Doc + uses: ./.github/actions/build-api-doc + + - name: Build Doc + run: yarn build - name: Get Deploy Name if: github.event_name != 'push' run: | echo "DEPLOY_NAME=deploy-preview-${{ github.event.number }}" >> $GITHUB_ENV - echo "PRODUCTION=false" >> $GITHUB_ENV - name: Deploy to Netlify uses: nwtgck/actions-netlify@v1 with: publish-dir: "./website/build" - production-deploy: ${{ env.PRODUCTION }} + production-deploy: false github-token: ${{ secrets.GITHUB_TOKEN }} deploy-message: "Deploy ${{ env.DEPLOY_NAME }}@${{ github.sha }}" enable-commit-comment: false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7811c634..cc626e4a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,8 @@ ci: autofix_commit_msg: ":rotating_light: auto fix by pre-commit hooks" autofix_prs: true - autoupdate_branch: dev - autoupdate_schedule: weekly + autoupdate_branch: master + autoupdate_schedule: monthly autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks" repos: - repo: https://github.com/pycqa/isort diff --git a/website/src/pages/changelog.md b/website/src/pages/changelog.md index a7b8d4a5..9c547878 100644 --- a/website/src/pages/changelog.md +++ b/website/src/pages/changelog.md @@ -13,14 +13,7 @@ description: Changelog ### 🍻 插件发布 -- Plugin: pixiv.net p站查询图片 [@yanyongyu](https://github.com/yanyongyu) ([#803](https://github.com/nonebot/nonebot2/pull/803)) - -## Latest changes - -### 💫 杂项 - -- CI: fix ci permission error [@yanyongyu](https://github.com/yanyongyu) ([#802](https://github.com/nonebot/nonebot2/pull/802)) -- CI: 添加更新日志自动更新 action [@yanyongyu](https://github.com/yanyongyu) ([#799](https://github.com/nonebot/nonebot2/pull/799)) +- Plugin: pixiv.net p 站查询图片 [@yanyongyu](https://github.com/yanyongyu) ([#803](https://github.com/nonebot/nonebot2/pull/803)) ## v2.0.0-beta.2