continue debugging github actions

ffmpegwasm · Dec 24, 2024 · ae10d97 · ae10d97
1 parent 6c8e3fe
commit ae10d97
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 56 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -162,18 +162,18 @@ jobs:
           # Run the verification in Chrome
           echo "Verifying browser environment..."
           npx mocha-headless-chrome \
-            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation" \
+            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation --disable-web-security --allow-insecure-localhost" \
             -a no-sandbox \
             -f http://localhost:3000/verify-browser.html
 
           # Run MT tests with verified configuration
           npx mocha-headless-chrome \
-            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation" \
+            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation --disable-web-security --allow-insecure-localhost" \
             -a no-sandbox \
             -f http://localhost:3000/tests/ffmpeg-core-mt.test.html 2>&1 | tee mt-core-test.log
 
           npx mocha-headless-chrome \
-            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation" \
+            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation --disable-web-security --allow-insecure-localhost" \
             -a no-sandbox \
             -f http://localhost:3000/tests/ffmpeg-mt.test.html 2>&1 | tee mt-test.log
 

diff --git a/tests/ffmpeg-core-mt.test.html b/tests/ffmpeg-core-mt.test.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8" />
     <meta charset="UTF-8" />
     <meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin" />
     <meta http-equiv="Cross-Origin-Embedder-Policy" content="require-corp" />

diff --git a/tests/ffmpeg-core-st.test.html b/tests/ffmpeg-core-st.test.html
@@ -1,27 +1,31 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>FFmpeg Unit Test</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css">
-</head>
-<body>
-  <div id="mocha"></div>
-  <script src="../node_modules/mocha/mocha.js"></script>
-  <script src="../node_modules/chai/chai.js"></script>
-  <script src="../packages/core/dist/umd/ffmpeg-core.js"></script>
-  <script src="./test-helper-browser.js"></script>
-  <script type="text/javascript">
-    window.FFMPEG_TYPE = "st";
-  </script>
-  <script>
-    mocha.setup('bdd');
-    mocha.timeout(60000);
-  </script>
-  <script src="./ffmpeg-core.test.js"></script>
-  <script>
-    window.expect = chai.expect;
-    mocha.run();
-  </script>
-</body>
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin" />
+    <meta http-equiv="Cross-Origin-Embedder-Policy" content="require-corp" />
+    <meta http-equiv="Cross-Origin-Resource-Policy" content="same-origin" />
+    <meta http-equiv="Origin-Agent-Cluster" content="?1" />
+    <title>FFmpeg Unit Test</title>
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  </head>
+  <body>
+    <div id="mocha"></div>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script src="../node_modules/chai/chai.js"></script>
+    <script src="../packages/core/dist/umd/ffmpeg-core.js"></script>
+    <script src="./test-helper-browser.js"></script>
+    <script type="text/javascript">
+      window.FFMPEG_TYPE = "st";
+    </script>
+    <script>
+      mocha.setup("bdd");
+      mocha.timeout(60000);
+    </script>
+    <script src="./ffmpeg-core.test.js"></script>
+    <script>
+      window.expect = chai.expect;
+      mocha.run();
+    </script>
+  </body>
 </html>
diff --git a/tests/ffmpeg-st.test.html b/tests/ffmpeg-st.test.html
@@ -1,28 +1,33 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>FFmpeg Unit Test</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css">
-</head>
-<body>
-  <div id="mocha"></div>
-  <script src="../node_modules/mocha/mocha.js"></script>
-  <script src="../node_modules/chai/chai.js"></script>
-  <script src="../packages/ffmpeg/dist/umd/ffmpeg.js"></script>
-  <script src="./test-helper-browser.js"></script>
-  <script type="text/javascript">
-    window.FFMPEG_TYPE = "st";
-    window.CORE_URL = "http://localhost:3000/packages/core/dist/umd/ffmpeg-core.js";
-  </script>
-  <script>
-    mocha.setup('bdd');
-    mocha.timeout(60000);
-  </script>
-  <script src="./ffmpeg.test.js"></script>
-  <script>
-    window.expect = chai.expect;
-    mocha.run();
-  </script>
-</body>
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin" />
+    <meta http-equiv="Cross-Origin-Embedder-Policy" content="require-corp" />
+    <meta http-equiv="Cross-Origin-Resource-Policy" content="same-origin" />
+    <meta http-equiv="Origin-Agent-Cluster" content="?1" />
+    <title>FFmpeg Unit Test</title>
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  </head>
+  <body>
+    <div id="mocha"></div>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script src="../node_modules/chai/chai.js"></script>
+    <script src="../packages/ffmpeg/dist/umd/ffmpeg.js"></script>
+    <script src="./test-helper-browser.js"></script>
+    <script type="text/javascript">
+      window.FFMPEG_TYPE = "st";
+      window.CORE_URL =
+        "http://localhost:3000/packages/core/dist/umd/ffmpeg-core.js";
+    </script>
+    <script>
+      mocha.setup("bdd");
+      mocha.timeout(60000);
+    </script>
+    <script src="./ffmpeg.test.js"></script>
+    <script>
+      window.expect = chai.expect;
+      mocha.run();
+    </script>
+  </body>
 </html>
diff --git a/tests/ffmpeg.test.js b/tests/ffmpeg.test.js
@@ -1,6 +1,4 @@
-import { FFmpegWASM } from "@ffmpeg/ffmpeg";
-
-const { FFmpeg } = FFmpegWASM;
+const { FFmpeg } = window.FFmpegWASM;
 
 const genName = (name) => `[ffmpeg][${FFMPEG_TYPE}] ${name}`;