Merge pull request #1197 from iptv-org/patch-2022.10.3

Patch 2022.10.3
This commit is contained in:
Aleksandr Statciuk 2022-10-19 23:34:39 +03:00 committed by GitHub
commit 1550d10fb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 39 deletions

View file

@ -21,10 +21,10 @@ jobs:
id: files id: files
with: with:
files: sites/**/*.channels.xml files: sites/**/*.channels.xml
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
if: ${{ !env.ACT && steps.files.outputs.any_changed == 'true' }} if: ${{ !env.ACT && steps.files.outputs.any_changed == 'true' }}
with: with:
node-version: '14' node-version: 16
cache: 'npm' cache: 'npm'
- name: validate - name: validate
if: steps.files.outputs.any_changed == 'true' if: steps.files.outputs.any_changed == 'true'

View file

@ -16,10 +16,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: npm run api:load - run: npm run api:load
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
if: ${{ !env.ACT }} if: ${{ !env.ACT }}
with: with:
node-version: '14' node-version: 16
cache: 'npm' cache: 'npm'
- run: npm install - run: npm install
- run: CHANNELS_PATH=sites/${{inputs.site}}/*.channels.xml npm run queue:create -- --max-clusters=1 --days=2 - run: CHANNELS_PATH=sites/${{inputs.site}}/*.channels.xml npm run queue:create -- --max-clusters=1 --days=2
@ -32,7 +32,7 @@ jobs:
with: with:
app_id: ${{ secrets.APP_ID }} app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }} private_key: ${{ secrets.APP_PRIVATE_KEY }}
- uses: JamesIves/github-pages-deploy-action@v4.3.3 - uses: JamesIves/github-pages-deploy-action@v4.4.1
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
with: with:
branch: gh-pages branch: gh-pages

View file

@ -1,33 +1,12 @@
name: _test name: _test
on: on:
workflow_dispatch: workflow_dispatch:
pull_request:
types: [opened, synchronize, reopened, edited]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
test: load:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: - run: npm run api:load
fetch-depth: 2 - run: npm install
- uses: tj-actions/changed-files@v19 - run: CHANNELS_PATH=sites/tvtv.us/tvtv.us_us.channels.xml npm run queue:create -- --max-clusters=1 --days=2
id: files - run: NODE_OPTIONS=--insecure-http-parser npm run cluster:load -- --timeout=30000 --cluster-id=1
with:
files: sites/**/*.config.js
- name: Set changed sites name
if: ${{ steps.files.outputs.any_changed == 'true' }}
id: sites
run: |
declare out
for i in ${{ steps.files.outputs.all_changed_files }}; do
out+="$(echo $i | cut -d'/' -f 2) "
done
echo "::set-output name=all_changed_sites::$(echo $out)"
- name: test
if: steps.files.outputs.any_changed == 'true'
run: |
npm install
npm test -- ${{ steps.sites.outputs.all_changed_sites }}

View file

@ -7,11 +7,11 @@ jobs:
update: update:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
if: ${{ !env.ACT }} if: ${{ !env.ACT }}
with: with:
node-version: '14' node-version: 16
cache: 'npm' cache: 'npm'
- run: npm install - run: npm install
- run: npm run api:update - run: npm run api:update
@ -21,7 +21,7 @@ jobs:
with: with:
app_id: ${{ secrets.APP_ID }} app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }} private_key: ${{ secrets.APP_PRIVATE_KEY }}
- uses: JamesIves/github-pages-deploy-action@4.1.1 - uses: JamesIves/github-pages-deploy-action@v4.4.1
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
with: with:
repository-name: iptv-org/api repository-name: iptv-org/api

View file

@ -8,15 +8,15 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: echo "::set-output name=branch_name::$(date +'bot/auto-update-%s')" run: echo "branch_name=$(date +'bot/auto-update-%s')" >> $GITHUB_OUTPUT
id: create-branch-name id: create-branch-name
- run: git config user.name 'iptv-bot[bot]' - run: git config user.name 'iptv-bot[bot]'
- run: git config user.email '84861620+iptv-bot[bot]@users.noreply.github.com' - run: git config user.email '84861620+iptv-bot[bot]@users.noreply.github.com'
- run: git checkout -b ${{ steps.create-branch-name.outputs.branch_name }} - run: git checkout -b ${{ steps.create-branch-name.outputs.branch_name }}
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
if: ${{ !env.ACT }} if: ${{ !env.ACT }}
with: with:
node-version: '14' node-version: 16
cache: 'npm' cache: 'npm'
- run: npm install - run: npm install
- run: npm run api:load - run: npm run api:load