From d1ace95cd5d6bd6068d343d1ef716865bbf7481e Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Thu, 24 Feb 2022 19:22:09 +0300 Subject: [PATCH] Update auto-update.yml --- .github/workflows/auto-update.yml | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 3c1030612..a5e3e1d55 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -120,24 +120,6 @@ 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 - name: Deploy to gh-pages uses: JamesIves/github-pages-deploy-action@v4.2.5 if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} @@ -161,3 +143,21 @@ 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