Skip to content

Commit

Permalink
fix: migrating from <10 to current with typescript (#24675)
Browse files Browse the repository at this point in the history 
* fix: migrating from <10 to current with typescript

* handle other platforms

* Update config.yml

Co-authored-by: Mark Noonan <mark@cypress.io>
  • Loading branch information
@ryanthemanuel @marktnoonan
ryanthemanuel and marktnoonan committed Nov 14, 2022
1 parent 741019d commit fbf2b0b
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Expand Up @@ -27,7 +27,7 @@ mainBuildFilters: &mainBuildFilters
branches:
only:
- develop
- 'ryanm/fix/improve-binary-cleanup'
- 'ryanm/fix/migrating-to-11-from-9-typescript'

# usually we don't build Mac app - it takes a long time
# but sometimes we want to really confirm we are doing the right thing
Expand All @@ -36,7 +36,7 @@ macWorkflowFilters: &darwin-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ]
- equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand All @@ -45,7 +45,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ]
- equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand All @@ -63,7 +63,7 @@ windowsWorkflowFilters: &windows-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ]
- equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -130,7 +130,7 @@ commands:
- run:
name: Check current branch to persist artifacts
command: |
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/improve-binary-cleanup" ]]; then
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/migrating-to-11-from-9-typescript" ]]; then
echo "Not uploading artifacts or posting install comment for this branch."
circleci-agent step halt
fi
Expand Down
11 changes: 6 additions & 5 deletions tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json
View file
Expand Up @@ -33,6 +33,11 @@
"./node_modules/mocha/node_modules/debug/src/node.js",
"./node_modules/morgan/node_modules/debug/src/node.js",
"./node_modules/prettier/index.js",
"./node_modules/prettier/parser-babel.js",
"./node_modules/prettier/parser-espree.js",
"./node_modules/prettier/parser-flow.js",
"./node_modules/prettier/parser-meriyah.js",
"./node_modules/prettier/parser-typescript.js",
"./node_modules/prettier/third-party.js",
"./node_modules/send/node_modules/debug/src/node.js",
"./node_modules/stream-parser/node_modules/debug/src/node.js",
Expand Down Expand Up @@ -483,12 +488,7 @@
"./node_modules/pngjs/lib/parser-sync.js",
"./node_modules/pngjs/lib/png.js",
"./node_modules/pngjs/lib/sync-inflate.js",
"./node_modules/prettier/parser-babel.js",
"./node_modules/prettier/parser-espree.js",
"./node_modules/prettier/parser-flow.js",
"./node_modules/prettier/parser-glimmer.js",
"./node_modules/prettier/parser-meriyah.js",
"./node_modules/prettier/parser-typescript.js",
"./node_modules/process-nextick-args/index.js",
"./node_modules/pseudomap/map.js",
"./node_modules/pumpify/index.js",
Expand Down Expand Up @@ -3644,6 +3644,7 @@
"./packages/net-stubbing/node_modules/mime-types/index.js",
"./packages/network/lib/allow-destroy.ts",
"./packages/network/lib/blocked.ts",
"./packages/network/lib/ca.ts",
"./packages/network/lib/concat-stream.ts",
"./packages/network/lib/http-utils.ts",
"./packages/network/lib/index.ts",
Expand Down
10 changes: 5 additions & 5 deletions tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json
View file
Expand Up @@ -33,6 +33,11 @@
"./node_modules/mocha/node_modules/debug/src/node.js",
"./node_modules/morgan/node_modules/debug/src/node.js",
"./node_modules/prettier/index.js",
"./node_modules/prettier/parser-babel.js",
"./node_modules/prettier/parser-espree.js",
"./node_modules/prettier/parser-flow.js",
"./node_modules/prettier/parser-meriyah.js",
"./node_modules/prettier/parser-typescript.js",
"./node_modules/prettier/third-party.js",
"./node_modules/send/node_modules/debug/src/node.js",
"./node_modules/stream-parser/node_modules/debug/src/node.js",
Expand Down Expand Up @@ -482,12 +487,7 @@
"./node_modules/pngjs/lib/parser-sync.js",
"./node_modules/pngjs/lib/png.js",
"./node_modules/pngjs/lib/sync-inflate.js",
"./node_modules/prettier/parser-babel.js",
"./node_modules/prettier/parser-espree.js",
"./node_modules/prettier/parser-flow.js",
"./node_modules/prettier/parser-glimmer.js",
"./node_modules/prettier/parser-meriyah.js",
"./node_modules/prettier/parser-typescript.js",
"./node_modules/process-nextick-args/index.js",
"./node_modules/pseudomap/map.js",
"./node_modules/pumpify/index.js",
Expand Down
10 changes: 5 additions & 5 deletions tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json
View file
Expand Up @@ -33,6 +33,11 @@
"./node_modules/mocha/node_modules/debug/src/node.js",
"./node_modules/morgan/node_modules/debug/src/node.js",
"./node_modules/prettier/index.js",
"./node_modules/prettier/parser-babel.js",
"./node_modules/prettier/parser-espree.js",
"./node_modules/prettier/parser-flow.js",
"./node_modules/prettier/parser-meriyah.js",
"./node_modules/prettier/parser-typescript.js",
"./node_modules/prettier/third-party.js",
"./node_modules/send/node_modules/debug/src/node.js",
"./node_modules/stream-parser/node_modules/debug/src/node.js",
Expand Down Expand Up @@ -481,12 +486,7 @@
"./node_modules/pngjs/lib/parser-sync.js",
"./node_modules/pngjs/lib/png.js",
"./node_modules/pngjs/lib/sync-inflate.js",
"./node_modules/prettier/parser-babel.js",
"./node_modules/prettier/parser-espree.js",
"./node_modules/prettier/parser-flow.js",
"./node_modules/prettier/parser-glimmer.js",
"./node_modules/prettier/parser-meriyah.js",
"./node_modules/prettier/parser-typescript.js",
"./node_modules/process-nextick-args/index.js",
"./node_modules/pseudomap/map.js",
"./node_modules/pumpify/index.js",
Expand Down
7 changes: 7 additions & 0 deletions tooling/v8-snapshot/src/setup/force-no-rewrite.ts
View file
Expand Up @@ -58,4 +58,11 @@ export default [
'packages/server/lib/open_project.ts',
'packages/server/lib/project-base.ts',
'packages/server/lib/socket-ct.ts',
'node_modules/prettier/index.js',
'node_modules/prettier/parser-babel.js',
'node_modules/prettier/parser-espree.js',
'node_modules/prettier/parser-flow.js',
'node_modules/prettier/parser-meriyah.js',
'node_modules/prettier/parser-typescript.js',
'node_modules/prettier/third-party.js',
]

5 comments on commit fbf2b0b

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on fbf2b0b Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux arm64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/11.1.0/linux-arm64/develop-fbf2b0b796236863ad14451f2c120e7e5f29d69b/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on fbf2b0b Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/11.1.0/linux-x64/develop-fbf2b0b796236863ad14451f2c120e7e5f29d69b/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on fbf2b0b Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin arm64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/11.1.0/darwin-arm64/develop-fbf2b0b796236863ad14451f2c120e7e5f29d69b/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on fbf2b0b Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/11.1.0/darwin-x64/develop-fbf2b0b796236863ad14451f2c120e7e5f29d69b/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on fbf2b0b Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the win32 x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/11.1.0/win32-x64/develop-fbf2b0b796236863ad14451f2c120e7e5f29d69b/cypress.tgz

Please sign in to comment.