Merge branch 'main' into feat/append-stats

videojs · Mar 29, 2021 · 66eaf5f · 66eaf5f
2 parents ef33818 + af5841c
commit 66eaf5f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
   ci:
     needs: should-skip
-    if: ${{needs.should-skip.outputs.should-skip-job != 'true'}}
+    if: ${{needs.should-skip.outputs.should-skip-job != 'true' || github.ref == 'refs/heads/main'}}
     strategy:
       fail-fast: false
       matrix:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "global": "^4.4.0",
     "m3u8-parser": "4.6.0",
     "mpd-parser": "0.15.4",
-    "mux.js": "5.10.0",
+    "mux.js": "5.11.0",
     "video.js": "^6 || ^7"
   },
   "devDependencies": {