From 65a8d93d6dba691f4d49cb5595a36d3a76379199 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Wed, 4 Aug 2021 04:54:02 +0300
Subject: [PATCH 1/5] Move the "sort" up

---
 .github/workflows/auto-update.yml | 46 +++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index e568487093..a787cd7b5d 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

From 1867e51025dd1ad860f1e1224a82148401e99dad Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Wed, 4 Aug 2021 05:00:49 +0300
Subject: [PATCH 2/5] Fix "deploy" job

---
 .github/workflows/auto-update.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index a787cd7b5d..1bbeff7399 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -336,6 +336,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 +347,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

From 88cc0974568a05bd536566ba7e3959f28394e819 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Wed, 4 Aug 2021 05:01:33 +0300
Subject: [PATCH 3/5] Fix "commit-changes" job

---
 .github/workflows/auto-update.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index 1bbeff7399..f5cbd50d60 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -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:

From fbebe14210aa3046e0d760b43e08eb36c48470f3 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Wed, 4 Aug 2021 05:03:07 +0300
Subject: [PATCH 4/5] Test

---
 .github/workflows/auto-update.yml | 323 +++++++++++++++---------------
 1 file changed, 161 insertions(+), 162 deletions(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index f5cbd50d60..3711d8dd2c 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -108,168 +108,167 @@ jobs:
     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
+        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

From a0ad1c160ae07e40c92ebc4f3627f2145dca58ea Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Wed, 4 Aug 2021 05:11:22 +0300
Subject: [PATCH 5/5] Update auto-update.yml

---
 .github/workflows/auto-update.yml | 323 +++++++++++++++---------------
 1 file changed, 162 insertions(+), 161 deletions(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index 3711d8dd2c..f5cbd50d60 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -108,167 +108,168 @@ jobs:
     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
+        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