Skip to content

Commit b1940e8

Browse files
Merge branch 'develop' into renovate/fs-extra-9.x
2 parents f689962 + a1e6d5c commit b1940e8

File tree

3 files changed

+1
-83
lines changed

3 files changed

+1
-83
lines changed

__snapshots__/bump-spec.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
exports['list of all projects'] = [
2-
{
3-
"repo": "cypress-io/cypress-test-tiny",
4-
"provider": "circle",
5-
"platform": "win32"
6-
},
72
{
83
"repo": "cypress-io/cypress-test-example-repos",
94
"provider": "circle",
105
"platform": "win32"
116
},
12-
{
13-
"repo": "cypress-io/cypress-test-tiny",
14-
"provider": "circle",
15-
"platform": "linux"
16-
},
177
{
188
"repo": "cypress-io/cypress-test-module-api",
199
"provider": "circle",
@@ -24,11 +14,6 @@ exports['list of all projects'] = [
2414
"provider": "circle",
2515
"platform": "linux"
2616
},
27-
{
28-
"repo": "cypress-io/cypress-test-nested-projects",
29-
"provider": "circle",
30-
"platform": "linux"
31-
},
3217
{
3318
"repo": "cypress-io/cypress-test-ci-environments",
3419
"provider": "circle",
@@ -39,11 +24,6 @@ exports['list of all projects'] = [
3924
"provider": "circle",
4025
"platform": "linux"
4126
},
42-
{
43-
"repo": "cypress-io/cypress-test-tiny",
44-
"provider": "circle",
45-
"platform": "darwin"
46-
},
4727
{
4828
"repo": "cypress-io/cypress-test-example-repos",
4929
"provider": "circle",
@@ -52,11 +32,6 @@ exports['list of all projects'] = [
5232
]
5333

5434
exports['should have just circle and darwin projects'] = [
55-
{
56-
"repo": "cypress-io/cypress-test-tiny",
57-
"provider": "circle",
58-
"platform": "darwin"
59-
},
6035
{
6136
"repo": "cypress-io/cypress-test-example-repos",
6237
"provider": "circle",

circle.yml

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,33 +1940,6 @@ jobs:
19401940
repo: cypress-example-todomvc
19411941
browser: firefox
19421942

1943-
test-binary-against-conduit-chrome:
1944-
<<: *defaults
1945-
resource_class: medium
1946-
steps:
1947-
- test-binary-against-repo:
1948-
repo: cypress-example-conduit-app
1949-
browser: chrome
1950-
command: "npm run cypress:run"
1951-
wait-on: http://localhost:3000
1952-
1953-
test-binary-against-api-testing-firefox:
1954-
<<: *defaults
1955-
steps:
1956-
- test-binary-against-repo:
1957-
repo: cypress-example-api-testing
1958-
browser: firefox
1959-
command: "npm run cy:run"
1960-
1961-
test-binary-against-piechopper-firefox:
1962-
<<: *defaults
1963-
resource_class: medium
1964-
steps:
1965-
- test-binary-against-repo:
1966-
repo: cypress-example-piechopper
1967-
browser: firefox
1968-
command: "npm run cypress:run"
1969-
19701943
test-binary-against-cypress-realworld-app:
19711944
<<: *defaults
19721945
resource_class: medium+
@@ -2254,12 +2227,7 @@ linux-workflow: &linux-workflow
22542227
<<: *mainBuildFilters
22552228
requires:
22562229
- create-build-artifacts
2257-
# Re-enable when the cypress-example-conduit-app project is fixed.
2258-
# https://github.com/cypress-io/cypress-example-conduit-app/issues/346
2259-
# - test-binary-against-conduit-chrome:
2260-
# <<: *mainBuildFilters
2261-
# requires:
2262-
# - create-build-artifacts
2230+
22632231
- test-binary-against-recipes-firefox:
22642232
<<: *mainBuildFilters
22652233
requires:
@@ -2272,14 +2240,6 @@ linux-workflow: &linux-workflow
22722240
<<: *mainBuildFilters
22732241
requires:
22742242
- create-build-artifacts
2275-
- test-binary-against-api-testing-firefox:
2276-
<<: *mainBuildFilters
2277-
requires:
2278-
- create-build-artifacts
2279-
- test-binary-against-piechopper-firefox:
2280-
<<: *mainBuildFilters
2281-
requires:
2282-
- create-build-artifacts
22832243
- test-binary-against-cypress-realworld-app:
22842244
<<: *mainBuildFilters
22852245
requires:
@@ -2335,19 +2295,6 @@ mac-workflow: &mac-workflow
23352295
requires:
23362296
- darwin-build
23372297

2338-
- test-binary-against-kitchensink:
2339-
name: darwin-test-binary-against-kitchensink
2340-
executor: mac
2341-
requires:
2342-
- darwin-create-build-artifacts
2343-
2344-
- test-binary-against-staging:
2345-
context: test-runner:record-tests
2346-
name: darwin-test-binary-against-staging
2347-
executor: mac
2348-
requires:
2349-
- darwin-create-build-artifacts
2350-
23512298
- test-binary-and-npm-against-other-projects:
23522299
context: test-runner:trigger-test-jobs
23532300
name: darwin-test-binary-and-npm-against-other-projects

scripts/binary/bump.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,15 @@ const _PROVIDERS = {
1616
circle: {
1717
main: 'cypress-io/cypress',
1818
linux: [
19-
'cypress-io/cypress-test-tiny',
2019
'cypress-io/cypress-test-module-api',
2120
'cypress-io/cypress-test-node-versions',
22-
'cypress-io/cypress-test-nested-projects',
2321
'cypress-io/cypress-test-ci-environments',
2422
'cypress-io/cypress-test-example-repos',
2523
],
2624
darwin: [
27-
'cypress-io/cypress-test-tiny',
2825
'cypress-io/cypress-test-example-repos',
2926
],
3027
win32: [
31-
'cypress-io/cypress-test-tiny',
3228
'cypress-io/cypress-test-example-repos',
3329
],
3430
},

0 commit comments

Comments
 (0)