mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-05-03 05:20:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/cypress-io/cypress into tbiethman/develop-into-10-with-electron

Browse Source 
# Conflicts:
#	circle.yml
#	packages/driver/cypress/integration/commands/actions/trigger_spec.js
#	packages/driver/cypress/integration/commands/actions/type_spec.js
#	packages/driver/cypress/integration/commands/files_spec.js
#	packages/electron/package.json
#	packages/launcher/lib/darwin/util.ts
#	packages/launcher/package.json
#	packages/server/__snapshots__/args_spec.js
#	packages/server/__snapshots__/cypress_spec.js
#	system-tests/projects/non-proxied/cypress/fixtures/cy-non-proxied.png
#	yarn.lock
This commit is contained in:
Tyler Biethman
2022-05-12 12:51:59 -05:00
parent a218f96223 8311cf15ff
commit 74fa12ab11
33 changed files with 164 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/run-docker-local.sh
+1 -1
View File
@@ -3,7 +3,7 @@ set e+x
echo "This script should be run from cypress's root"
name=cypress/browsers:node16.5.0-chrome94-ff93
name=cypress/browsers:node16.13.2-chrome100-ff98
echo "Pulling CI container $name"
docker pull $name