From e0da7fd2a5162ff44351512f612ef9738de58593 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Wed, 23 Feb 2022 08:42:16 +0300 Subject: [PATCH] Update auto-update.yml --- .github/workflows/auto-update.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index a1347bb20f..d9aa50c2b7 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -115,7 +115,7 @@ jobs: if: ${{ !env.ACT }} run: | git add streams/* - git commit -m "[Bot] Update streams" + git commit -m "[Bot] Update /streams" git add README.md git commit -m "[Bot] Update README.md" git status @@ -132,7 +132,13 @@ jobs: This pull request is created by [auto-update][1] workflow. [1]: https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }} - - name: Deploy to GitHub Pages + - 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' }} with: @@ -143,7 +149,7 @@ jobs: git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com commit-message: '[Bot] Deploy to GitHub Pages' clean: false - - name: Deploy to iptv-org/api + - name: deploy to iptv-org/api uses: JamesIves/github-pages-deploy-action@v4.2.5 if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} with: @@ -155,9 +161,3 @@ jobs: git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com commit-message: '[Bot] Deploy to iptv-org/api' clean: false - - 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