Skip to content

Commit 36f4655

Browse files
PopeyeTheSai10rPopeyeTheSai10r
authored
Merge pull request #2893 from iptv-org/patch-2025.10.1
Patch 2025.10.1
2 parents 9d20d1f + 5ebb47c commit 36f4655

File tree

107 files changed

+25156
-25674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+25156
-25674
lines changed

‎.github/workflows/check.yml‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
1-
name: check
2-
on:
3-
workflow_dispatch:
4-
pull_request:
5-
types: [opened, synchronize, reopened, edited]
6-
branches:
7-
- master
8-
concurrency:
9-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
10-
cancel-in-progress: true
11-
jobs:
12-
check:
13-
runs-on: ubuntu-latest
14-
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 2
18-
- name: changed files
19-
id: files
20-
run: |
21-
git fetch origin master:master
22-
JS_ANY_CHANGED=false
23-
JS_ALL_CHANGED_FILES=$(git diff --name-only master -- tests/**/*.js tests/**/*.ts scripts/**/*.js scripts/**/*.mts scripts/**/*.ts sites/**/*.js sites/**/*.ts | tr '\n' ' ')
24-
if [ -n "${JS_ALL_CHANGED_FILES}" ]; then
25-
JS_ANY_CHANGED=true
26-
fi
27-
echo "js_all_changed_files=$JS_ALL_CHANGED_FILES" >> "$GITHUB_OUTPUT"
28-
echo "js_any_changed=$JS_ANY_CHANGED" >> "$GITHUB_OUTPUT"
29-
CHANNELS_ANY_CHANGED=false
30-
CHANNELS_ALL_CHANGED_FILES=$(git diff --name-only master -- sites/**/*.channels.xml | tr '\n' ' ')
31-
if [ -n "${CHANNELS_ALL_CHANGED_FILES}" ]; then
32-
CHANNELS_ANY_CHANGED=true
33-
fi
34-
echo "channels_all_changed_files=$CHANNELS_ALL_CHANGED_FILES" >> "$GITHUB_OUTPUT"
35-
echo "channels_any_changed=$CHANNELS_ANY_CHANGED" >> "$GITHUB_OUTPUT"
36-
- uses: actions/setup-node@v4
37-
if: ${{ steps.files.outputs.js_any_changed == 'true' || steps.files.outputs.channels_any_changed == 'true' }}
38-
with:
39-
node-version: 22
40-
cache: 'npm'
41-
- name: install dependencies
42-
if: steps.files.outputs.js_any_changed == 'true' || steps.files.outputs.channels_any_changed == 'true'
43-
run: SKIP_POSTINSTALL=1 npm install
44-
- name: check changed js-files
45-
if: steps.files.outputs.js_any_changed == 'true'
46-
run: |
47-
npx eslint ${{ steps.files.outputs.js_all_changed_files }}
48-
- name: check changed *.channels.xml
49-
if: steps.files.outputs.channels_any_changed == 'true'
50-
run: |
51-
npm run channels:lint -- ${{ steps.files.outputs.channels_all_changed_files }}
52-
npm run postinstall
1+
name: check
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
branches:
7+
- master
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
10+
cancel-in-progress: true
11+
permissions:
12+
packages: read
13+
jobs:
14+
main:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Get list of changed files
19+
id: files
20+
run: |
21+
git fetch origin master:master
22+
ANY_CHANGED=false
23+
JS_ANY_CHANGED=false
24+
JS_ALL_CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only master -- tests/**/*.js tests/**/*.ts scripts/**/*.js scripts/**/*.mts scripts/**/*.ts sites/**/*.js sites/**/*.ts | tr '\n' ' ')
25+
if [ -n "${JS_ALL_CHANGED_FILES}" ]; then
26+
JS_ANY_CHANGED=true
27+
ANY_CHANGED=true
28+
fi
29+
echo "js_all_changed_files=$JS_ALL_CHANGED_FILES" >> "$GITHUB_OUTPUT"
30+
echo "js_any_changed=$JS_ANY_CHANGED" >> "$GITHUB_OUTPUT"
31+
CHANNELS_ANY_CHANGED=false
32+
CHANNELS_ALL_CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only master -- sites/**/*.channels.xml | tr '\n' ' ')
33+
if [ -n "${CHANNELS_ALL_CHANGED_FILES}" ]; then
34+
CHANNELS_ANY_CHANGED=true
35+
ANY_CHANGED=true
36+
fi
37+
echo "channels_all_changed_files=$CHANNELS_ALL_CHANGED_FILES" >> "$GITHUB_OUTPUT"
38+
echo "channels_any_changed=$CHANNELS_ANY_CHANGED" >> "$GITHUB_OUTPUT"
39+
echo "any_changed=$ANY_CHANGED" >> "$GITHUB_OUTPUT"
40+
- uses: actions/setup-node@v4
41+
if: steps.files.outputs.any_changed == 'true'
42+
with:
43+
node-version: 22
44+
cache: 'npm'
45+
- name: Install dependencies
46+
if: steps.files.outputs.any_changed == 'true'
47+
run: SKIP_POSTINSTALL=1 npm install
48+
- name: Check changed js-files
49+
if: steps.files.outputs.js_any_changed == 'true'
50+
run: npx eslint ${{ steps.files.outputs.js_all_changed_files }}
51+
- name: Check changed *.channels.xml files
52+
if: steps.files.outputs.channels_any_changed == 'true'
53+
run: |
54+
npm run postinstall
55+
npm run channels:lint -- ${{ steps.files.outputs.channels_all_changed_files }}
5356
npm run channels:validate -- ${{ steps.files.outputs.channels_all_changed_files }}

‎.github/workflows/format.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: format
2+
on:
3+
workflow_dispatch:
4+
# schedule:
5+
# - cron: "0 12 * * *"
6+
permissions:
7+
packages: read
8+
jobs:
9+
main:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- uses: tibdex/[email protected]
14+
if: ${{ !env.ACT }}
15+
id: create-app-token
16+
with:
17+
app_id: ${{ secrets.APP_ID }}
18+
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19+
- uses: actions/checkout@v4
20+
if: ${{ !env.ACT }}
21+
with:
22+
token: ${{ steps.create-app-token.outputs.token }}
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: 22
26+
cache: 'npm'
27+
- name: Install dependencies
28+
run: npm install
29+
- name: Format *.channels.xml files
30+
run: npm run channels:format
31+
- name: Get list of changed *.channels.xml files
32+
id: files
33+
run: |
34+
git fetch origin master:master
35+
CHANNELS_ANY_CHANGED=false
36+
CHANNELS_ALL_CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only master -- sites/**/*.channels.xml | tr '\n' ' ')
37+
if [ -n "${CHANNELS_ALL_CHANGED_FILES}" ]; then
38+
CHANNELS_ANY_CHANGED=true
39+
fi
40+
echo "channels_all_changed_files=$CHANNELS_ALL_CHANGED_FILES" >> "$GITHUB_OUTPUT"
41+
echo "channels_any_changed=$CHANNELS_ANY_CHANGED" >> "$GITHUB_OUTPUT"
42+
- name: Check changed *.channels.xml files
43+
if: steps.files.outputs.channels_any_changed == 'true'
44+
run: |
45+
npm run channels:lint -- ${{ steps.files.outputs.channels_all_changed_files }}
46+
npm run channels:validate -- ${{ steps.files.outputs.channels_all_changed_files }}
47+
- name: Setup git
48+
run: |
49+
git config user.name "iptv-bot[bot]"
50+
git config user.email "84861620+iptv-bot[bot]@users.noreply.github.com"
51+
- name: Commit changed *.channels.xml files
52+
if: steps.files_after.outputs.channels_any_changed == 'true'
53+
run: |
54+
git add streams
55+
git status
56+
git commit -m "[Bot] Format *.channels.xml files" -m "Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [format](https://github.com/iptv-org/epg/actions/runs/${{ github.run_id }}) workflow." --no-verify
57+
- name: Push all changes to the repository
58+
if: ${{ !env.ACT && github.ref == 'refs/heads/master' && steps.files_after.outputs.channels_any_changed == 'true' }}
59+
run: git push

‎.github/workflows/update.yml‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
1-
name: update
2-
on:
3-
workflow_dispatch:
4-
schedule:
5-
- cron: '0 0 * * *'
6-
jobs:
7-
main:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- uses: actions/checkout@v4
11-
- uses: tibdex/[email protected]
12-
if: ${{ !env.ACT }}
13-
id: create-app-token
14-
with:
15-
app_id: ${{ secrets.APP_ID }}
16-
private_key: ${{ secrets.APP_PRIVATE_KEY }}
17-
- uses: actions/checkout@v4
18-
if: ${{ !env.ACT }}
19-
with:
20-
token: ${{ steps.create-app-token.outputs.token }}
21-
- name: setup git
22-
run: |
23-
git config user.name "iptv-bot[bot]"
24-
git config user.email "84861620+iptv-bot[bot]@users.noreply.github.com"
25-
- uses: actions/setup-node@v4
26-
with:
27-
node-version: 22
28-
cache: 'npm'
29-
- name: install dependencies
30-
run: npm install
31-
- name: check *.channels.xml
32-
run: |
33-
npm run channels:lint
34-
- name: update sites.md
35-
run: npm run sites:update
36-
- run: git status
37-
- name: commit changes to sites.md
38-
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
39-
run: |
40-
SITE=SITES.md
41-
CHANGED=$(git diff ${SITE})
42-
if [ -n "${CHANGED}" ]; then
43-
git add ${SITE}
44-
git commit -m "[Bot] Update ${SITE}" -m "Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/epg/actions/runs/${{ github.run_id }}) workflow." --no-verify
45-
git push
46-
fi
47-
- name: generate .api/guides.json
48-
run: npm run api:generate
49-
- run: git status
50-
- name: move .api/guides.json to iptv-org/api
51-
uses: JamesIves/[email protected]
52-
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
53-
with:
54-
repository-name: iptv-org/api
55-
branch: gh-pages
56-
folder: .api
57-
token: ${{ steps.create-app-token.outputs.token }}
58-
git-config-name: iptv-bot[bot]
59-
git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com
60-
commit-message: '[Bot] Deploy to iptv-org/api'
1+
name: update
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
jobs:
7+
main:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
- uses: tibdex/[email protected]
12+
if: ${{ !env.ACT }}
13+
id: create-app-token
14+
with:
15+
app_id: ${{ secrets.APP_ID }}
16+
private_key: ${{ secrets.APP_PRIVATE_KEY }}
17+
- uses: actions/checkout@v4
18+
if: ${{ !env.ACT }}
19+
with:
20+
token: ${{ steps.create-app-token.outputs.token }}
21+
- name: setup git
22+
run: |
23+
git config user.name "iptv-bot[bot]"
24+
git config user.email "84861620+iptv-bot[bot]@users.noreply.github.com"
25+
- uses: actions/setup-node@v4
26+
with:
27+
node-version: 22
28+
cache: 'npm'
29+
- name: install dependencies
30+
run: npm install
31+
- name: check *.channels.xml
32+
run: npm run channels:lint
33+
- name: update sites.md
34+
run: npm run sites:update
35+
- run: git status
36+
- name: commit changes to sites.md
37+
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
38+
run: |
39+
SITE=SITES.md
40+
CHANGED=$(git diff ${SITE})
41+
if [ -n "${CHANGED}" ]; then
42+
git add ${SITE}
43+
git commit -m "[Bot] Update ${SITE}" -m "Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/epg/actions/runs/${{ github.run_id }}) workflow." --no-verify
44+
git push
45+
fi
46+
- name: generate .api/guides.json
47+
run: npm run api:generate
48+
- run: git status
49+
- name: move .api/guides.json to iptv-org/api
50+
uses: JamesIves/[email protected]
51+
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
52+
with:
53+
repository-name: iptv-org/api
54+
branch: gh-pages
55+
folder: .api
56+
token: ${{ steps.create-app-token.outputs.token }}
57+
git-config-name: iptv-bot[bot]
58+
git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com
59+
commit-message: '[Bot] Deploy to iptv-org/api'
6160
clean: false

‎.gitignore‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
/node_modules/
2-
/temp/
3-
/channels.xml
4-
/guide.xml
5-
/guide.xml.gz
6-
7-
# macOS
1+
/node_modules/
2+
/temp/
3+
/channels.xml
4+
/guide.xml
5+
/guide.xml.gz
6+
.secrets
7+
8+
# macOS
89
.DS_Store

0 commit comments

Comments
 (0)