Skip to content

Commit 0a7bd3c

Browse files
committed
Merge branch 'develop' into tgriesser/fix/filter-large-user-supplied-values
* develop: chore: bump resource class for driver-integration-electron (#32959) chore(deps): update dependency @types/enzyme to v3.10.19 (#32961) chore: fix link to publish-binary job (#32949)
2 parents 186b513 + 9ba3b41 commit 0a7bd3c

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.circleci/src/pipeline/@pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,6 +2133,7 @@ jobs:
21332133

21342134
driver-integration-tests-electron:
21352135
<<: *defaults
2136+
resource_class: medium+
21362137
parallelism: 5
21372138
steps:
21382139
- run-driver-integration-tests:

.circleci/src/pipeline/commands/trigger-publish-binary-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ steps:
6767
fi
6868
6969
echo "Pipeline saved to triggered_pipeline.json"
70-
echo "Triggered pipeline: https://app.circleci.com/pipelines/github/cypress-io/cypress-publish-binary/$(jq -r '.number' triggered_pipeline.json)"
70+
echo "Triggered pipeline: https://app.circleci.com/pipelines/github/cypress-io/cypress-publish-binary/$(jq -r '.number' ~/triggered_pipeline.json)"
7171
- persist_to_workspace:
7272
root: ~/
7373
paths:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
},
274274
"resolutions": {
275275
"**/@types/cheerio": "0.22.35",
276-
"**/@types/enzyme": "3.10.5",
276+
"**/@types/enzyme": "3.10.19",
277277
"**/jquery": "3.7.1",
278278
"**/socket.io-parser": "4.0.5",
279279
"**/ua-parser-js": "0.7.33",

yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8116,7 +8116,7 @@
81168116
dependencies:
81178117
"@types/deep-eql" "*"
81188118

8119-
"@types/cheerio@*", "@types/cheerio@0.22.35", "@types/cheerio@<1":
8119+
"@types/[email protected]", "@types/cheerio@<1":
81208120
version "0.22.35"
81218121
resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.35.tgz#0d16dc1f24d426231c181b9c31847f673867595f"
81228122
integrity sha512-yD57BchKRvTV+JD53UZ6PD8KWY5g5rvvMLRnZR3EQBCZXiDT/HR+pKpMzFGlWNhFrXlo7VPZXtKvIEwZkAWOIA==
@@ -8230,13 +8230,13 @@
82308230
dependencies:
82318231
"@types/enzyme" "*"
82328232

8233-
"@types/enzyme@*", "@types/[email protected].5":
8234-
version "3.10.5"
8235-
resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz#fe7eeba3550369eed20e7fb565bfb74eec44f1f0"
8236-
integrity sha512-R+phe509UuUYy9Tk0YlSbipRpfVtIzb/9BHn5pTEtjJTF5LXvUjrIQcZvNyANNEyFrd2YGs196PniNT1fgvOQA==
8233+
"@types/enzyme@*", "@types/[email protected].19":
8234+
version "3.10.19"
8235+
resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.19.tgz#a4ae751c13e0428171d53cdc0d3d9f9aca7f7689"
8236+
integrity sha512-kIfCo6/DdpgCHgmrLgPTugjzbZ46BUK8S2IP0kYo8+62LD2l1k8mSVsc+zQYNTdjDRoh2E9Spxu6F1NnEiW38Q==
82378237
dependencies:
8238-
"@types/cheerio" "*"
8239-
"@types/react" "*"
8238+
"@types/cheerio" "<1"
8239+
"@types/react" "^16"
82408240

82418241
"@types/eslint-scope@^3.7.3", "@types/eslint-scope@^3.7.7":
82428242
version "3.7.7"

0 commit comments

Comments
 (0)