@@ -29,6 +29,7 @@ mainBuildFilters: &mainBuildFilters
2929 only :
3030 - develop
3131 - 10.0-release
32+ - test-binary-downstream-windows
3233
3334# usually we don't build Mac app - it takes a long time
3435# but sometimes we want to really confirm we are doing the right thing
@@ -38,6 +39,7 @@ macWorkflowFilters: &mac-workflow-filters
3839 or :
3940 - equal : [ develop, << pipeline.git.branch >> ]
4041 - equal : [ '10.0-release', << pipeline.git.branch >> ]
42+ - equal : [ renovate/cypress-request-2.x, << pipeline.git.branch >> ]
4143 - matches :
4244 pattern : " -release$"
4345 value : << pipeline.git.branch >>
@@ -47,6 +49,7 @@ windowsWorkflowFilters: &windows-workflow-filters
4749 or :
4850 - equal : [ develop, << pipeline.git.branch >> ]
4951 - equal : [ '10.0-release', << pipeline.git.branch >> ]
52+ - equal : [ test-binary-downstream-windows, << pipeline.git.branch >> ]
5053 - matches :
5154 pattern : " -release$"
5255 value : << pipeline.git.branch >>
@@ -1665,7 +1668,7 @@ jobs:
16651668 - run :
16661669 name : Check current branch to persist artifacts
16671670 command : |
1668- if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-release" && "$CIRCLE_BRANCH" != "renovate/cypress-request-2.x" && "$CIRCLE_BRANCH" != "tgriesser/fix/patch-resolutions" ]]; then
1671+ if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "test-binary-downstream-windows" && "$CIRCLE_BRANCH" != "10.0-release" && "$CIRCLE_BRANCH" != "renovate/cypress-request-2.x" && "$CIRCLE_BRANCH" != "tgriesser/fix/patch-resolutions" ]]; then
16691672 echo "Not uploading artifacts or posting install comment for this branch."
16701673 circleci-agent step halt
16711674 fi
@@ -1750,7 +1753,12 @@ jobs:
17501753
17511754 test-binary-and-npm-against-other-projects :
17521755 << : *defaults
1753- resource_class : medium
1756+ parameters :
1757+ << : *defaultsParameters
1758+ resource_class :
1759+ type : string
1760+ default : medium
1761+ resource_class : << parameters.resource_class >>
17541762 steps :
17551763 # needs uploaded NPM and test binary
17561764 - restore_cached_workspace
@@ -1759,23 +1767,14 @@ jobs:
17591767 - run : ls -la binary-url.json npm-package-url.json
17601768 - run : cat binary-url.json
17611769 - run : cat npm-package-url.json
1762- - run : mkdir /tmp/testing
1763- - run :
1764- name : create dummy package
1765- working_directory : /tmp/testing
1766- command : npm init -y
17671770 - run :
17681771 # install NPM from unique urls
1769- name : Install Cypress
1772+ name : Install Cypress Binary in Dummy Package
17701773 command : |
17711774 node scripts/test-unique-npm-and-binary.js \
17721775 --npm npm-package-url.json \
17731776 --binary binary-url.json \
17741777 --cwd /tmp/testing
1775- - run :
1776- name : Verify Cypress binary
1777- working_directory : /tmp/testing
1778- command : $(yarn bin)/cypress verify
17791778 - run :
17801779 name : Running other test projects with new NPM package and binary
17811780 command : |
@@ -1806,19 +1805,19 @@ jobs:
18061805 - run :
18071806 name : Cypress version
18081807 working_directory : test-binary
1809- command : $(yarn bin)/ cypress version
1808+ command : $(yarn bin cypress) version
18101809 - run :
18111810 name : Verify Cypress binary
18121811 working_directory : test-binary
1813- command : $(yarn bin)/ cypress verify
1812+ command : $(yarn bin cypress) verify
18141813 - run :
18151814 name : Cypress help
18161815 working_directory : test-binary
1817- command : $(yarn bin)/ cypress help
1816+ command : $(yarn bin cypress) help
18181817 - run :
18191818 name : Cypress info
18201819 working_directory : test-binary
1821- command : $(yarn bin)/ cypress info
1820+ command : $(yarn bin cypress) info
18221821 - store-npm-logs
18231822
18241823 test-npm-module-on-minimum-node-version :
@@ -1999,7 +1998,7 @@ jobs:
19991998 CYPRESS_PROJECT_ID=$TEST_TINY_PROJECT_ID \
20001999 CYPRESS_RECORD_KEY=$TEST_TINY_RECORD_KEY \
20012000 CYPRESS_INTERNAL_ENV=staging \
2002- $(yarn bin)/ cypress run --record
2001+ $(yarn bin cypress) run --record
20032002 - store-npm-logs
20042003
20052004 test-binary-against-recipes-firefox :
@@ -2145,11 +2144,11 @@ jobs:
21452144 - run :
21462145 name : Cypress help
21472146 working_directory : test-binary
2148- command : $(yarn bin)/ cypress help
2147+ command : $(yarn bin cypress) help
21492148 - run :
21502149 name : Cypress info
21512150 working_directory : test-binary
2152- command : $(yarn bin)/ cypress info
2151+ command : $(yarn bin cypress) info
21532152 - run :
21542153 name : Add Cypress demo
21552154 working_directory : test-binary
@@ -2165,11 +2164,11 @@ jobs:
21652164 - run :
21662165 name : Verify Cypress binary
21672166 working_directory : test-binary
2168- command : DEBUG=cypress:cli $(yarn bin)/ cypress verify
2167+ command : DEBUG=cypress:cli $(yarn bin cypress) verify
21692168 - run :
21702169 name : Run Cypress binary
21712170 working_directory : test-binary
2172- command : DEBUG=cypress:cli $(yarn bin)/ cypress run
2171+ command : DEBUG=cypress:cli $(yarn bin cypress) run
21732172 - store-npm-logs
21742173
21752174linux-workflow : &linux-workflow
@@ -2584,6 +2583,14 @@ windows-workflow: &windows-workflow
25842583 requires :
25852584 - windows-build
25862585
2586+ - test-binary-and-npm-against-other-projects :
2587+ context : test-runner:trigger-test-jobs
2588+ name : windows-test-binary-and-npm-against-other-projects
2589+ executor : windows
2590+ resource_class : windows.medium
2591+ requires :
2592+ - windows-create-build-artifacts
2593+
25872594workflows :
25882595 linux :
25892596 << : *linux-workflow
0 commit comments