Skip to content

Commit

Permalink
Merge branch '10.0-release' into tgriesser/refactor/fix-makeLegacyCon…
Browse files Browse the repository at this point in the history
…text

* 10.0-release: (45 commits)
  fix: various Nav Bar fixes (#19283)
  build: add patch package as a dev dependency for fe-shared
  chore: hoist is - fun with cached dependencies
  build: hoist is hard
  build: better hoisting strategy
  fix: remove windows and mac workflow from branch
  revert: remove change about node version 17
  build: remove testing of desktop-gui assets
  build: run window & mac CI in this branch
  build: more fixes
  build: remove toycode mdi from launchpad
  rename patch because of dev dep
  build: fix  merge issue in packages generation
  chore: update sass for windows compatibility
  fix: Do not crash when a ill formed URL request is proxied (#19274)
  fix: remove desktop-gui from circle.yml
  change whitepace in patch
  fix: adding timeout option to writeFile command (#19015)
  release 9.1.1
  fix: patch-package is not applied in dist'ed build (#19239)
  ...
  • Loading branch information
tgriesser committed Dec 8, 2021
2 parents 5705320 + aa7b05d commit fab3f25
Show file tree
Hide file tree
Showing 94 changed files with 1,412 additions and 1,557 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto

*.json text eol=lf
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ Below are some guidelines Cypress uses when reviewing dependency updates.

## Deployment

We will try to review and merge pull requests quickly. If you want to know our build process or build your own Cypress binary, read [DEPLOY.md](./DEPLOY.md).
We will try to review and merge pull requests quickly. If you want to know our build process or build your own Cypress binary, read [the "Release Process" guide](./guides/release-process.md).

Independent packages are deployed immediately upon being merged into master. You can read more [above](#independent-packages-ci-workflow).

Expand Down
4 changes: 2 additions & 2 deletions __snapshots__/bump-spec.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
exports['list of all projects'] = [
{
"repo": "cypress-io/cypress-test-tiny",
"provider": "appVeyor",
"provider": "circle",
"platform": "win32"
},
{
"repo": "cypress-io/cypress-test-example-repos",
"provider": "appVeyor",
"provider": "circle",
"platform": "win32"
},
{
Expand Down
1 change: 0 additions & 1 deletion __snapshots__/packages-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ exports['packages can copy files from package.json 1'] = {
}
}


exports['transformRequires can find and replace symlink requires 1'] = {
"[cwd]": {
"build": {
Expand Down
105 changes: 0 additions & 105 deletions appveyor.yml

This file was deleted.

0 comments on commit fab3f25

Please sign in to comment.