Update auto-update.yml

.github/workflows/auto-update.yml

@@ -17,51 +17,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           branch: 'bot/auto-update'
-  format:
-    runs-on: ubuntu-latest
-    needs: create-branch
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Install Dependencies
-        run: npm install
-      - name: Format Playlists
-        run: node scripts/format.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Formate playlists'
-          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/*
-  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: create-branch
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -80,305 +38,18 @@ jobs:
           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: sort
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Install Dependencies
-        run: npm install
-      - name: Filter Playlists
-        run: node scripts/filter.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Filter channels'
-          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/*
-  detect-resolution:
-    runs-on: ubuntu-latest
-    needs: filter
-    continue-on-error: true
-    strategy:
-      fail-fast: false
-      matrix:
-        country: [
-            # ad,
-            # ae,
-            # af,
-            # ag,
-            # al,
-            # am,
-            an
-            # ao,
-            # ar,
-            # at,
-            # au,
-            # aw,
-            # az,
-            # ba,
-            # bb,
-            # bd,
-            # be,
-            # bf,
-            # bg,
-            # bh,
-            # bn,
-            # bo,
-            # br,
-            # bs,
-            # by,
-            # ca,
-            # cd,
-            # cg,
-            # ch,
-            # ci,
-            # cl,
-            # cm,
-            # cn,
-            # co,
-            # cr,
-            # cu,
-            # cw,
-            # cy,
-            # cz,
-            # de,
-            # dk,
-            # do,
-            # dz,
-            # ec,
-            # ee,
-            # eg,
-            # es,
-            # et,
-            # fi,
-            # fj,
-            # fo,
-            # fr,
-            # ge,
-            # gh,
-            # gm,
-            # gn,
-            # gp,
-            # gq,
-            # gr,
-            # gt,
-            # hk,
-            # hn,
-            # hr,
-            # ht,
-            # hu,
-            # id,
-            # ie,
-            # il,
-            # in,
-            # iq,
-            # ir,
-            # is,
-            # it,
-            # jm,
-            # jo,
-            # jp,
-            # ke,
-            # kg,
-            # kh,
-            # kp,
-            # kr,
-            # kw,
-            # kz,
-            # la,
-            # lb,
-            # li,
-            # lk,
-            # lt,
-            # lu,
-            # lv,
-            # ly,
-            # ma,
-            # mc,
-            # md,
-            # me,
-            # mk,
-            # ml,
-            # mm,
-            # mn,
-            # mo,
-            # mt,
-            # mv,
-            # mx,
-            # my,
-            # mz,
-            # ne,
-            # ng,
-            # ni,
-            # nl,
-            # no,
-            # np,
-            # nz,
-            # om,
-            # pa,
-            # pe,
-            # ph,
-            # pk,
-            # pl,
-            # pr,
-            # ps,
-            # pt,
-            # py,
-            # qa,
-            # ro,
-            # rs,
-            # ru,
-            # rw,
-            # sa,
-            # sd,
-            # se,
-            # sg,
-            # si,
-            # sk,
-            # sl,
-            # sm,
-            # sn,
-            # so,
-            # sv,
-            # sy,
-            # th,
-            # tj,
-            # tm,
-            # tn,
-            # tr,
-            # tt,
-            # tw,
-            # tz,
-            # ua,
-            # ug,
-            # uk,
-            # us,
-            # uy,
-            # uz,
-            # va,
-            # ve,
-            # vi,
-            # vn,
-            # xk,
-            # ye,
-            # zm
-          ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Install Dependencies
-        run: npm install
-      - name: Detect Resolution
-        run: node scripts/detect-resolution.js --country=${{ matrix.country }}
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: channels
-          path: channels/${{ matrix.country }}.m3u
-  commit-changes:
-    runs-on: ubuntu-latest
-    needs: detect-resolution
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: channels
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Detect resolution'
-          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/*
-  generate:
-    runs-on: ubuntu-latest
-    needs: commit-changes
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Install Dependencies
-        run: npm install
-      - name: Generate Playlists
-        run: node scripts/generate.js
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: gh-pages
-          path: .gh-pages/
-  deploy:
-    if: ${{ github.ref == 'refs/heads/master' }}
-    runs-on: ubuntu-latest
-    needs: generate
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: gh-pages
-      - name: Generate Token
-        uses: tibdex/github-app-token@v1
-        id: generate-token
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-      - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@4.1.1
-        with:
-          branch: 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
-          commit-message: '[Bot] Deploy to GitHub Pages'
-  update-readme:
-    runs-on: ubuntu-latest
-    needs: generate
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/auto-update
-      - name: Install Dependencies
-        run: npm install
-      - name: Update README.md
-        run: node scripts/update-readme.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Update README.md'
-          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: README.md
   pull-request:
-    needs: update-readme
+    needs: sort
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           ref: bot/auto-update
+      - name: Fetch Origin
+        run: git fetch origin --allow-unrelated-histories
+      - name: Update from master
+        run: git merge origin/master
       - name: Generate Token
         uses: tibdex/github-app-token@v1
         id: generate-token
@@ -399,16 +70,3 @@ jobs:
           delete-branch: false
           base: master
           token: ${{ steps.generate-token.outputs.token }}
-      - name: Enable Pull Request Automerge
-        if: steps.pr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v1
-        with:
-          token: ${{ secrets.PAT }}
-          pull-request-number: ${{ steps.pr.outputs.pull-request-number }}
-          merge-method: squash
-      - name: Approve Pull Request
-        if: github.ref == 'refs/heads/master' && steps.pr.outputs.pull-request-operation == 'created'
-        uses: juliangruber/approve-pull-request-action@v1
-        with:
-          github-token: ${{ secrets.PAT }}
-          number: ${{ steps.pr.outputs.pull-request-number }}