Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: windows #22234

Merged
merged 12 commits into from
Jun 10, 2022
Merged

fix: windows #22234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6479eda
fix windows
ryanthemanuel Jun 9, 2022
26ce935
bump resource class
ryanthemanuel Jun 9, 2022
5a5296b
bad resource class
ryanthemanuel Jun 9, 2022
88a7438
bump resource class
ryanthemanuel Jun 9, 2022
e7ebf63
bump resource class
ryanthemanuel Jun 9, 2022
30cffe7
bump resource class
ryanthemanuel Jun 9, 2022
0456b00
Merge branch 'develop' into ryanm/playground/fix-windows-build
ryanthemanuel Jun 9, 2022
a39cbc6
Fix builds
ryanthemanuel Jun 10, 2022
19d6f1b
Revert "fix: support ESM projects using TypeScript with ts-node/esm (…
ryanthemanuel Jun 10, 2022
06d252f
Revert "Revert "fix: support ESM projects using TypeScript with ts-no…
ryanthemanuel Jun 10, 2022
eb09ea3
Update to fix failing tests on windows
ryanthemanuel Jun 10, 2022
94f46e4
Merge branch 'develop' into ryanm/playground/fix-windows-build
ryanthemanuel Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ executors:
machine:
image: windows-server-2019-vs2019:stable
shell: bash.exe -eo pipefail
resource_class: windows.medium
resource_class: windows.xlarge
environment:
PLATFORM: windows

Expand Down Expand Up @@ -2581,29 +2581,29 @@ windows-workflow: &windows-workflow
- node_modules_install:
name: windows-node-modules-install
executor: windows
resource_class: windows.medium
resource_class: windows.xlarge
only-cache-for-root-user: true

- build:
name: windows-build
context: test-runner:env-canary
executor: windows
resource_class: windows.medium
resource_class: windows.xlarge
requires:
- windows-node-modules-install

- run-app-integration-tests-chrome:
name: windows-run-app-integration-tests-chrome
executor: windows
resource_class: windows.medium
resource_class: windows.xlarge
context: test-runner:launchpad-tests
requires:
- windows-build

- run-launchpad-integration-tests-chrome:
name: windows-run-launchpad-integration-tests-chrome
executor: windows
resource_class: windows.medium
resource_class: windows.xlarge
context: test-runner:launchpad-tests
requires:
- windows-build
Expand All @@ -2619,15 +2619,15 @@ windows-workflow: &windows-workflow
<<: *full-windows-workflow-filters
name: windows-unit-tests
executor: windows
resource_class: windows.medium
resource_class: windows.xlarge
requires:
- windows-build

- create-build-artifacts:
<<: *full-windows-workflow-filters
name: windows-create-build-artifacts
executor: windows
resource_class: windows.medium
resource_class: windows.xlarge
Copy link
Contributor

Choose a reason for hiding this comment

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

A little unsettling that we don't know why this is required, but glad to have windows CI back to green.

Copy link
Member

Choose a reason for hiding this comment

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

Agreed. 😕

context:
- test-runner:sign-windows-binary
- test-runner:upload
Expand Down
6 changes: 6 additions & 0 deletions packages/app/cypress/e2e/subscriptions/authChange-subscription.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ describe('authChange subscription', () => {

it('responds to authChange subscription for login', () => {
cy.contains('Log In')
cy.wait(500)
cy.withCtx(async (ctx) => {
await ctx.actions.auth.login()
})
Expand All @@ -42,6 +43,7 @@ describe('authChange subscription', () => {
setActiveUser()
cy.reload() // Reload to show the latest state
cy.contains('Test User')
cy.wait(500)
cy.withCtx(async (ctx) => {
await ctx.actions.auth.logout()
})
Expand All @@ -58,6 +60,7 @@ describe('authChange subscription', () => {

it('responds to authChange subscription for login', () => {
cy.contains('Log In')
cy.wait(500)
cy.withCtx(async (ctx) => {
await ctx.actions.auth.login()
})
Expand All @@ -69,6 +72,7 @@ describe('authChange subscription', () => {
setActiveUser()
cy.reload() // Reload to show the latest state
cy.contains('Test User')
cy.wait(500)
cy.withCtx(async (ctx) => {
await ctx.actions.auth.logout()
})
Expand All @@ -84,6 +88,7 @@ describe('authChange subscription', () => {

it('responds to authChange subscription for login', () => {
cy.contains('Log In')
cy.wait(500)
cy.withCtx(async (ctx) => {
await ctx.actions.auth.login()
})
Expand All @@ -95,6 +100,7 @@ describe('authChange subscription', () => {
setActiveUser()
cy.visitLaunchpad()
cy.contains('Test User')
cy.wait(500)
cy.withCtx(async (ctx) => {
await ctx.actions.auth.logout()
})
Expand Down
1 change: 1 addition & 0 deletions packages/app/cypress/e2e/top-nav.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ describe('App Top Nav Workflows', () => {
const oldFetch = ctx.util.fetch

o.sinon.stub(ctx.util, 'fetch').callsFake(async (url: RequestInfo | URL, init?: RequestInit) => {
await new Promise((resolve) => setTimeout(resolve, 500))
if (['https://download.cypress.io/desktop.json', 'https://registry.npmjs.org/cypress'].includes(String(url))) {
throw new Error(String(url))
}
Expand Down
3 changes: 2 additions & 1 deletion packages/data-context/src/data/ProjectConfigIpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import inspector from 'inspector'
import debugLib from 'debug'
import { autoBindDebug, hasTypeScriptInstalled } from '../util'
import _ from 'lodash'
import { pathToFileURL } from 'url'

const pkg = require('@packages/root')
const debug = debugLib(`cypress:lifecycle:ProjectConfigIpc`)

const CHILD_PROCESS_FILE_PATH = require.resolve('@packages/server/lib/plugins/child/require_async_child')

const tsNodeEsm = require.resolve('ts-node/esm/transpile-only')
const tsNodeEsm = pathToFileURL(require.resolve('ts-node/esm/transpile-only')).href
const tsNode = require.resolve('@packages/server/lib/plugins/child/register_ts_node')

export type IpcHandler = (ipc: ProjectConfigIpc) => void
Expand Down
1 change: 1 addition & 0 deletions packages/launchpad/cypress/e2e/slow-network.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ describe('slow network: launchpad', () => {
cy.visitLaunchpad()
cy.get('[data-cy=top-nav-cypress-version-current-link]').should('not.exist')
cy.contains('Log In')
cy.wait(500)
cy.withCtx(async (ctx, o) => {
o.testState.pendingFetches.map((f) => f.resolve())
})
Expand Down