From b2d2c911bcb0f5f98d330d18a1cee3f0023cce29 Mon Sep 17 00:00:00 2001
From: Brandon Casey <2381475+brandonocasey@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:50:31 -0400
Subject: [PATCH 1/2] chore: never skip main ci runs (#1108)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 20a0582da..e58d43019 100644
--- 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:

From af5841caa764f74682d5cbd56e1eeacf3c74dad0 Mon Sep 17 00:00:00 2001
From: Brandon Casey <2381475+brandonocasey@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:50:57 -0400
Subject: [PATCH 2/2] chore: update to mux.js@5.11.0 (#1109)

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c247866c3..8ecc81d44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6475,9 +6475,9 @@
       "dev": true
     },
     "mux.js": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.10.0.tgz",
-      "integrity": "sha512-kLzvYsHYBwNa+ckkmpxWV3eImwntJbrwd1KbN4WR0hLe+dK/KB82aCuC0fQzAI2hkjYszdlSGsAWFgYdiFBUuA==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.11.0.tgz",
+      "integrity": "sha512-Q/iLfohHh5Pp6lW7EFtcxNuaCNJ3Ruywfy46pWLsY+yIxR1kXXImYY1wOhg8jLdBMs1kRaZqsiB4Zncsiw0a2Q==",
       "requires": {
         "@babel/runtime": "^7.11.2"
       }
diff --git a/package.json b/package.json
index 67b179140..99305aab5 100644
--- 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": {