Merge branch 'development' into feature/cmcd-v2-keys

Dash-Industry-Forum · Oct 21, 2024 · d988338 · d988338
2 parents f2d751b + 1fba00e
commit d988338
Show file tree

Hide file tree

Showing 136 changed files with 7,005 additions and 3,663 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.eslintrc b/.eslintrc
@@ -7,11 +7,13 @@
   },
   "globals": {
     "dashjs": true,
+    "ManagedMediaSource": true,
     "WebKitMediaSource": true,
     "MediaSource": true,
     "WebKitMediaKeys": true,
     "MSMediaKeys": true,
-    "MediaKeys": true
+    "MediaKeys": true,
+    "google": true
   },
   "parserOptions": {
     "ecmaVersion": 2020,

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -57,6 +57,6 @@ jobs:
                 with:
                     key: ${{ secrets.private_key }}
                     known_hosts: unnecessary
-
-            -   name: Deploy with rsync
-                run: rsync -av -c -e "ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss" ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}
+            -   name: Deploy with scp
+                run: |
+                    scp -r -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}
diff --git a/.github/workflows/verify_branch.yml b/.github/workflows/verify_branch.yml
@@ -0,0 +1,40 @@
+name: verify_branch
+
+on:
+    push:
+        branches:
+            - '**'  # Triggers on push to any branch
+
+jobs:
+    build_and_unit_test:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v4
+            -   uses: actions/setup-node@v4
+                with:
+                    node-version: 'latest'
+                    cache: 'npm'
+            -   name: Cache node modules
+                id: cache-npm
+                uses: actions/cache@v3
+                env:
+                    cache-name: cache-node-modules
+                with:
+                    # npm cache files are stored in `~/.npm` on Linux/macOS
+                    path: ~/.npm
+                    key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                    restore-keys: |
+                        ${{ runner.os }}-build-${{ env.cache-name }}-
+                        ${{ runner.os }}-build-
+                        ${{ runner.os }}-
+
+            -   if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
+                name: List the state of node modules
+                continue-on-error: true
+                run: npm list
+            -   run: npm install
+            -   run: tsc
+            -   run: npm run lint
+            -   run: npm run test
+            -   run: npm run webpack-build
+