diff --git a/.github/workflows/draft.yml b/.github/workflows/draft.yml index 239a5732..0e55f291 100644 --- a/.github/workflows/draft.yml +++ b/.github/workflows/draft.yml @@ -3,6 +3,9 @@ on: pull_request: branches: - main + push: + branches: + - renovate/** # support automergeType=branch # This configuration cancels previous runs if a new run is started on the same PR. Only one run at a time per PR. # From https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-a-fallback-value @@ -25,7 +28,7 @@ jobs: - run: yarn sync - run: yarn build - name: Deploy to Draft to Netlify - if: '! github.event.pull_request.head.repo.fork' + if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }} id: deployment env: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} @@ -35,13 +38,13 @@ jobs: netlify deploy --dir build --message '${{ github.event.commits[0].message }}' > log.tmp.txt 2>&1 cat log.tmp.txt | grep -E 'Website draft URL:' > log.txt - name: Read deployment log - if: '! github.event.pull_request.head.repo.fork' + if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }} id: logs uses: juliangruber/read-file-action@v1 with: path: log.txt - name: Comment PR with draft publish logs - if: '! github.event.pull_request.head.repo.fork' + if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }} id: create-comment uses: peter-evans/create-or-update-comment@v4 with: @@ -49,6 +52,6 @@ jobs: body: | ${{ steps.logs.outputs.content }} - name: Comment debug - if: '! github.event.pull_request.head.repo.fork' + if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }} run: | echo "Comment ID - ${{ steps.create-comment.outputs.comment-id }}" diff --git a/renovate.json b/renovate.json index 91b39475..5d91a10c 100644 --- a/renovate.json +++ b/renovate.json @@ -6,6 +6,7 @@ ":semanticCommitScopeDisabled" ], "automergeStrategy": "squash", + "automergeType": "branch", "semanticCommitType": "meta", "ignorePaths": ["static/"], "packageRules": [