]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #41039 from nextcloud/fix/run-cypress-always-parallel
authorFerdinand Thiessen <opensource@fthiessen.de>
Sun, 22 Oct 2023 16:58:39 +0000 (18:58 +0200)
committerGitHub <noreply@github.com>
Sun, 22 Oct 2023 16:58:39 +0000 (18:58 +0200)
feat(cypress): Always run cypress CI in parallel

1  2 
.github/workflows/cypress.yml
package-lock.json
package.json

Simple merge
index 1df3434928e46367a3409c7252ebc257e817b29f,e08e10bcbc50b72bd22dc85b22123f8f68bea9bc..8f21a01922017b82f5a1d21e779492236c2c8632
          "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",
          "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 1296b681e20c19cdd28d02eb8bcef6003a44d3af,2f8aa2a7948b8bade13b740d8b5679192a86d5eb..f63a2d879f276e8309993a79553f070c21335371
      "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",