diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index e568487093..f5cbd50d60 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -38,30 +38,9 @@ jobs: commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>' branch: bot/auto-update file_pattern: channels/* - remove-duplicates: - runs-on: ubuntu-latest - needs: format - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - ref: bot/auto-update - - name: Install Dependencies - run: npm install - - name: Remove Duplicates - run: node scripts/remove-duplicates.js - - name: Commit Changes - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: '[Bot] Remove duplicates' - commit_user_name: iptv-bot - commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com - commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>' - branch: bot/auto-update - file_pattern: channels/* sort: runs-on: ubuntu-latest - needs: remove-duplicates + needs: format steps: - name: Checkout uses: actions/checkout@v2 @@ -80,9 +59,30 @@ jobs: commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>' branch: bot/auto-update file_pattern: channels/* - filter: + remove-duplicates: runs-on: ubuntu-latest needs: sort + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: bot/auto-update + - name: Install Dependencies + run: npm install + - name: Remove Duplicates + run: node scripts/remove-duplicates.js + - name: Commit Changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: '[Bot] Remove duplicates' + commit_user_name: iptv-bot + commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com + commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>' + branch: bot/auto-update + file_pattern: channels/* + filter: + runs-on: ubuntu-latest + needs: remove-duplicates steps: - name: Checkout uses: actions/checkout@v2 @@ -297,6 +297,7 @@ jobs: uses: actions/download-artifact@v2 with: name: channels + path: channels - name: Commit Changes uses: stefanzweifel/git-auto-commit-action@v4 with: @@ -336,6 +337,7 @@ jobs: uses: actions/download-artifact@v2 with: name: gh-pages + path: .gh-pages - name: Generate Token uses: tibdex/github-app-token@v1 id: generate-token @@ -346,7 +348,7 @@ jobs: uses: JamesIves/github-pages-deploy-action@4.1.1 with: branch: gh-pages - folder: gh-pages + folder: .gh-pages token: ${{ steps.generate-token.outputs.token }} git-config-name: iptv-bot git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com