mirror of https://github.com/iptv-org/iptv
Merge branch 'master' into refactor-format-js
commit
6cbce4f201
@ -0,0 +1,26 @@
|
||||
name: Auto-merge PRs
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- labeled
|
||||
- unlabeled
|
||||
- synchronize
|
||||
- opened
|
||||
- edited
|
||||
- ready_for_review
|
||||
- reopened
|
||||
- unlocked
|
||||
pull_request_review:
|
||||
types:
|
||||
- submitted
|
||||
status: {}
|
||||
jobs:
|
||||
automerge:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: automerge
|
||||
uses: "pascalgn/automerge-action@f84dd310ea4a19890c70a4ff11ab282a872fb94b"
|
||||
env:
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
AUTOMERGE: "automerge"
|
@ -1,21 +0,0 @@
|
||||
name: Generate Playlists and Deploy
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
jobs:
|
||||
generate:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Generate Playlists and Deploy
|
||||
uses: JamesIves/github-pages-deploy-action@master
|
||||
env:
|
||||
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
|
||||
BASE_BRANCH: master
|
||||
BRANCH: gh-pages
|
||||
FOLDER: .gh-pages
|
||||
BUILD_SCRIPT: npm install && npm run generate
|
@ -1 +1 @@
|
||||
<table><thead><tr><th align="left">Category</th><th align="right">Channels</th><th align="left">Playlist</th></tr></thead><tbody><tr><td align="left">Auto</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/auto.m3u</code></td></tr><tr><td align="left">Business</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/business.m3u</code></td></tr><tr><td align="left">Classic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/classic.m3u</code></td></tr><tr><td align="left">Comedy</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/comedy.m3u</code></td></tr><tr><td align="left">Documentary</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/documentary.m3u</code></td></tr><tr><td align="left">Education</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/education.m3u</code></td></tr><tr><td align="left">Entertainment</td><td align="right">78</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/entertainment.m3u</code></td></tr><tr><td align="left">Family</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/family.m3u</code></td></tr><tr><td align="left">Fashion</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/fashion.m3u</code></td></tr><tr><td align="left">Food</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/food.m3u</code></td></tr><tr><td align="left">General</td><td align="right">32</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr><tr><td align="left">History</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/history.m3u</code></td></tr><tr><td align="left">Hobby</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/hobby.m3u</code></td></tr><tr><td align="left">Kids</td><td align="right">41</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/kids.m3u</code></td></tr><tr><td align="left">Legislative</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/legislative.m3u</code></td></tr><tr><td align="left">Lifestyle</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/lifestyle.m3u</code></td></tr><tr><td align="left">Local</td><td align="right">251</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr><tr><td align="left">Movies</td><td align="right">107</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/movies.m3u</code></td></tr><tr><td align="left">Music</td><td align="right">231</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr><tr><td align="left">News</td><td align="right">302</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr><tr><td align="left">Religious</td><td align="right">89</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr><tr><td align="left">Shop</td><td align="right">22</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/shop.m3u</code></td></tr><tr><td align="left">Sport</td><td align="right">175</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sport.m3u</code></td></tr><tr><td align="left">Travel</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr><tr><td align="left">Weather</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr><tr><td align="left">XXX</td><td align="right">75</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr><tr><td align="left">Other</td><td align="right">5273</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr></tbody></table>
|
||||
<table><thead><tr><th align="left">Category</th><th align="right">Channels</th><th align="left">Playlist</th></tr></thead><tbody><tr><td align="left">Auto</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/auto.m3u</code></td></tr><tr><td align="left">Business</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/business.m3u</code></td></tr><tr><td align="left">Classic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/classic.m3u</code></td></tr><tr><td align="left">Comedy</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/comedy.m3u</code></td></tr><tr><td align="left">Documentary</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/documentary.m3u</code></td></tr><tr><td align="left">Education</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/education.m3u</code></td></tr><tr><td align="left">Entertainment</td><td align="right">78</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/entertainment.m3u</code></td></tr><tr><td align="left">Family</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/family.m3u</code></td></tr><tr><td align="left">Fashion</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/fashion.m3u</code></td></tr><tr><td align="left">Food</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/food.m3u</code></td></tr><tr><td align="left">General</td><td align="right">32</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr><tr><td align="left">History</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/history.m3u</code></td></tr><tr><td align="left">Hobby</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/hobby.m3u</code></td></tr><tr><td align="left">Kids</td><td align="right">41</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/kids.m3u</code></td></tr><tr><td align="left">Legislative</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/legislative.m3u</code></td></tr><tr><td align="left">Lifestyle</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/lifestyle.m3u</code></td></tr><tr><td align="left">Local</td><td align="right">251</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr><tr><td align="left">Movies</td><td align="right">107</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/movies.m3u</code></td></tr><tr><td align="left">Music</td><td align="right">231</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr><tr><td align="left">News</td><td align="right">302</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr><tr><td align="left">Religious</td><td align="right">89</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr><tr><td align="left">Shop</td><td align="right">22</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/shop.m3u</code></td></tr><tr><td align="left">Sport</td><td align="right">175</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sport.m3u</code></td></tr><tr><td align="left">Travel</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr><tr><td align="left">Weather</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr><tr><td align="left">XXX</td><td align="right">75</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr><tr><td align="left">Other</td><td align="right">5316</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr></tbody></table>
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,11 @@
|
||||
#EXTM3U
|
||||
#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="" tvg-logo="https://i.imgur.com/DRUNmHQ.png" group-title="",B-One TV
|
||||
https://stream.ecable.tv/b-one/tracks-v1a1/mono.m3u8
|
||||
#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="" tvg-logo="https://i.imgur.com/IEM93cd.png" group-title="",RTNC
|
||||
https://stream.ecable.tv/rtnc/tracks-v1a1/mono.m3u8
|
||||
#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="French" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Music",Trace Kitoko
|
||||
http://d2ktlibtvvj8vp.cloudfront.net/trace_kitoko/6/prog_index.m3u8
|
||||
#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="French" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Music",Trace Kitoko
|
||||
https://d2ktlibtvvj8vp.cloudfront.net/trace_kitoko/6/prog_index.m3u8?fluxustv.m3u8
|
||||
#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="" tvg-logo="https://i.imgur.com/Csb9UFe.jpg" group-title="",Télé 50
|
||||
https://stream.ecable.tv/tele50/tracks-v1a1/mono.m3u8
|
||||
|
@ -1 +1,3 @@
|
||||
#EXTM3U
|
||||
#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="" tvg-logo="https://i.imgur.com/Cx5hQ1x.jpg" group-title="",TG | TVT International
|
||||
https://stream.ecable.tv/tvt/tracks-v1a1/mono.m3u8
|
||||
|
Loading…
Reference in New Issue