fixup! split up jquerys to avoid browserstack timeout

jquery · Jun 3, 2024 · 0964ddd · 0964ddd
1 parent 47a5412
commit 0964ddd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
@@ -16,8 +16,8 @@ jobs:
       NODE_VERSION: 20.x
     name: ${{ matrix.BROWSER }}
     concurrency:
-      group: ${{ github.sha }}-${{ matrix.BROWSER }}
-    timeout-minutes: 90
+      group: ${{ github.sha }}-${{ matrix.BROWSER }}-${{ matrix.JQUERYS.name }}
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -34,6 +34,11 @@ jobs:
           - 'Opera_latest-1'
           - 'Safari_latest'
           - 'Safari_latest-1'
+        JQUERYS:
+          - versions: '--jquery 3.x-git --jquery git --jquery 3.7.1 --jquery 3.6.4 --jquery 3.5.1 --jquery 3.4.1 --jquery 3.3.1 --jquery 3.2.1 --jquery 3.1.1 --jquery 3.0.0'
+            name: 'jQuery 3.x'
+          - versions: '--jquery 2.2.4 --jquery 1.12.4 --jquery 2.1.4 --jquery 1.11.3 --jquery 2.0.3 --jquery 1.10.2 --jquery 1.9.1 --jquery 1.8.3'
+            name: 'jQuery 1.x/2.x'
 
     steps:
       - name: Checkout
@@ -62,10 +67,6 @@ jobs:
         run: |
           npm run test:unit -- -v \
             --browserstack "${{ matrix.BROWSER }}" \
-            --jquery 3.x-git --jquery git \
-            --jquery 3.7.1 --jquery 3.6.4 --jquery 3.5.1 --jquery 3.4.1 \
-            --jquery 3.3.1 --jquery 3.2.1 --jquery 3.1.1 --jquery 3.0.0 \
-            --jquery 2.2.4 --jquery 1.12.4 --jquery 2.1.4 --jquery 1.11.3 \
-            --jquery 2.0.3 --jquery 1.10.2 --jquery 1.9.1 --jquery 1.8.3 \
+            ${{ matrix.JQUERYS.versions }} \
             --run-id ${{ github.run_id }} \
             --retries 3 --hard-retries 1
diff --git a/tests/runner/browsers.js b/tests/runner/browsers.js
@@ -64,7 +64,7 @@ export async function createBrowserWorker( url, browser, options, restarts = 0 )
 		worker = await createWorker( {
 			...browser,
 			url: encodeURI( url ),
-			project: "jquery",
+			project: "jquery-ui",
 			build: `Run ${ runId }`,
 
 			// This is the maximum timeout allowed

diff --git a/tests/runner/run.js b/tests/runner/run.js
@@ -277,7 +277,7 @@ export async function run( {
 
 	for ( const browser of browsers ) {
 		for ( const suite of suites ) {
-			queueRuns( [ suite ], browser );
+			queueRuns( suite, browser );
 		}
 	}