From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Sun, 22 Oct 2023 16:58:39 +0000 (+0200)
Subject: Merge pull request #41039 from nextcloud/fix/run-cypress-always-parallel
X-Git-Tag: v28.0.0beta1~87
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=91e02fea0babd6dd97cd7302c963c97e1b696cbd;p=nextcloud-server.git

Merge pull request #41039 from nextcloud/fix/run-cypress-always-parallel

feat(cypress): Always run cypress CI in parallel
---

91e02fea0babd6dd97cd7302c963c97e1b696cbd
diff --cc package-lock.json
index 1df3434928e,e08e10bcbc5..8f21a019220
--- a/package-lock.json
+++ b/package-lock.json
@@@ -116,9 -116,10 +116,10 @@@
          "css-loader": "^6.8.1",
          "cypress": "^13.3.0",
          "cypress-if": "^1.10.5",
+         "cypress-split": "^1.15.3",
          "cypress-wait-until": "^2.0.1",
          "dockerode": "^4.0.0",
 -        "eslint-plugin-cypress": "^2.14.0",
 +        "eslint-plugin-cypress": "^2.15.1",
          "eslint-plugin-es": "^4.1.0",
          "exports-loader": "^4.0.0",
          "file-loader": "^6.2.0",
@@@ -22917,10 -23452,48 +23505,48 @@@
          "url": "https://github.com/sponsors/ljharb"
        }
      },
+     "node_modules/shelljs": {
+       "version": "0.8.5",
+       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+       "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+       "dev": true,
+       "dependencies": {
+         "glob": "^7.0.0",
+         "interpret": "^1.0.0",
+         "rechoir": "^0.6.2"
+       },
+       "bin": {
+         "shjs": "bin/shjs"
+       },
+       "engines": {
+         "node": ">=4"
+       }
+     },
+     "node_modules/shelljs/node_modules/interpret": {
+       "version": "1.4.0",
+       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+       "dev": true,
+       "engines": {
+         "node": ">= 0.10"
+       }
+     },
+     "node_modules/shelljs/node_modules/rechoir": {
+       "version": "0.6.2",
+       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+       "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+       "dev": true,
+       "dependencies": {
+         "resolve": "^1.1.6"
+       },
+       "engines": {
+         "node": ">= 0.10"
+       }
+     },
      "node_modules/shiki": {
 -      "version": "0.14.3",
 -      "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.3.tgz",
 -      "integrity": "sha512-U3S/a+b0KS+UkTyMjoNojvTgrBHjgp7L6ovhFVZsXmBGnVdQ4K4U9oK0z63w538S91ATngv1vXigHCSWOwnr+g==",
 +      "version": "0.14.5",
 +      "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.5.tgz",
 +      "integrity": "sha512-1gCAYOcmCFONmErGTrS1fjzJLA7MGZmKzrBNX7apqSwhyITJg2O102uFzXUeBxNnEkDA9vHIKLyeKq0V083vIw==",
        "dependencies": {
          "ansi-sequence-parser": "^1.1.0",
          "jsonc-parser": "^3.2.0",
diff --cc package.json
index 1296b681e20,2f8aa2a7948..f63a2d879f2
--- a/package.json
+++ b/package.json
@@@ -143,9 -143,10 +143,10 @@@
      "css-loader": "^6.8.1",
      "cypress": "^13.3.0",
      "cypress-if": "^1.10.5",
+     "cypress-split": "^1.15.3",
      "cypress-wait-until": "^2.0.1",
      "dockerode": "^4.0.0",
 -    "eslint-plugin-cypress": "^2.14.0",
 +    "eslint-plugin-cypress": "^2.15.1",
      "eslint-plugin-es": "^4.1.0",
      "exports-loader": "^4.0.0",
      "file-loader": "^6.2.0",