Skip to content

Commit ec5de9f

Browse files
committed
Merge branch 'development' of https://github.com/Dash-Industry-Forum/dash.js into ui/robustness-settings
2 parents 032c50b + b04b483 commit ec5de9f

File tree

754 files changed

+56565
-65510
lines changed

Some content is hidden

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

754 files changed

+56565
-65510
lines changed

.browserslistrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
defaults

.circleci/config.yml

Lines changed: 0 additions & 225 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 40 deletions
This file was deleted.

.github/workflows/deploy.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ on:
2020
jobs:
2121
deploy:
2222
runs-on: ubuntu-latest
23-
23+
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v4
2626
- name: Use Node.js
27-
uses: actions/setup-node@v2
27+
uses: actions/setup-node@v4
2828
with:
29-
node-version: "14.x"
29+
node-version: "20.x"
3030
- name: Install dependencies
3131
run: npm install
3232
- name: Run build
@@ -39,15 +39,25 @@ jobs:
3939
find: "<!-- commit-info -->"
4040
replace: ${{env.replacement_string}}
4141
include: "samples/dash-if-reference-player/index.html"
42+
- name: Build all samples
43+
run: |
44+
for sample in "network-interceptor"; do
45+
echo "Building sample: $sample"
46+
cd samples/$sample
47+
npm install
48+
npm run build
49+
rm -rf node_modules
50+
done
4251
- name: Copy to deploy directory for deployment
4352
run: |
44-
mkdir ${{inputs.envname}}
45-
cp -R contrib dist samples test/functional/config test/functional/tests ${{inputs.envname}}
53+
mkdir -p ${{inputs.envname}}
54+
cp -R contrib dist samples ${{inputs.envname}}
4655
- name: Install SSH Key
4756
uses: shimataro/ssh-key-action@v2
4857
with:
4958
key: ${{ secrets.private_key }}
5059
known_hosts: unnecessary
51-
52-
- name: Deploy with rsync
53-
run: rsync -av -c -e "ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss" ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}
60+
- name: Deploy with scp
61+
run: |
62+
ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{ secrets.USER }}@${{ secrets.HOST }} "mkdir -p ${{ inputs.deploy_path }}/${{inputs.envname}}"
63+
scp -r -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}

.github/workflows/deploy_build.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: deploy_build
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
envname:
7+
required: true
8+
type: string
9+
deploy_path:
10+
required: true
11+
type: string
12+
secrets:
13+
host:
14+
required: true
15+
user:
16+
required: true
17+
private_key:
18+
required: true
19+
20+
jobs:
21+
deploy:
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- uses: actions/checkout@v4
26+
- name: Use Node.js
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version: "20.x"
30+
- name: Install dependencies
31+
run: npm install
32+
- name: Build dist files
33+
run: npm run build
34+
- name: Build JSDoc
35+
run: npm run doc
36+
continue-on-error: true
37+
- name: Copy to deploy directory for deployment
38+
run: |
39+
mkdir -p ${{inputs.envname}}
40+
cp -R docs/jsdoc ${{inputs.envname}}/jsdoc && cp -R dist/modern/umd/* ${{inputs.envname}} && cp -R dist/* index.d.ts ${{inputs.envname}}
41+
- name: Install SSH Key
42+
uses: shimataro/ssh-key-action@v2
43+
with:
44+
key: ${{ secrets.private_key }}
45+
known_hosts: unnecessary
46+
- name: Deploy with scp
47+
run: |
48+
ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{ secrets.USER }}@${{ secrets.HOST }} "mkdir -p ${{ inputs.deploy_path }}/${{inputs.envname}}"
49+
scp -r -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: deploy_latest
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
8+
jobs:
9+
deploy_latest:
10+
if: github.repository == 'Dash-Industry-Forum/dash.js'
11+
uses: ./.github/workflows/deploy_build.yml
12+
with:
13+
envname: latest
14+
deploy_path: '/377335'
15+
secrets:
16+
host: ${{secrets.HOST}}
17+
user: ${{secrets.USER}}
18+
private_key: ${{secrets.PRIVATE_KEY}}

0 commit comments

Comments
 (0)