diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 6310e0f6cc..4425ae873d 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -119,6 +119,24 @@ jobs: git commit -m "[Bot] Update README.md" git status git push -u origin ${{ steps.create-branch-name.outputs.branch_name }} + - uses: repo-sync/pull-request@v2 + if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} + id: pull-request + with: + github_token: ${{ steps.create-app-token.outputs.token }} + source_branch: ${{ steps.create-branch-name.outputs.branch_name }} + destination_branch: 'master' + pr_title: '[Bot] Daily update' + pr_body: | + This pull request is created by [auto-update][1] workflow. + + [1]: https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }} + # - uses: juliangruber/merge-pull-request-action@v1 + # if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} + # with: + # github-token: ${{ secrets.PAT }} + # number: ${{ steps.pull-request.outputs.pr_number }} + # method: squash # - uses: JamesIves/github-pages-deploy-action@4.1.1 # if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} # with: @@ -141,21 +159,3 @@ jobs: # git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com # commit-message: '[Bot] Deploy to iptv-org/api' # clean: false - # - uses: repo-sync/pull-request@v2 - # if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} - # id: pull-request - # with: - # github_token: ${{ steps.create-app-token.outputs.token }} - # source_branch: ${{ steps.create-branch-name.outputs.branch_name }} - # destination_branch: 'master' - # pr_title: '[Bot] Daily update' - # pr_body: | - # This pull request is created by [auto-update][1] workflow. - - # [1]: https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }} - # - uses: juliangruber/merge-pull-request-action@v1 - # if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} - # with: - # github-token: ${{ secrets.PAT }} - # number: ${{ steps.pull-request.outputs.pr_number }} - # method: squash