Skip to content

Commit

Permalink
Resolve Windows FS Issues (#810) and Ignore Linux Pipelines
Browse files Browse the repository at this point in the history
* Resolve Windows FS Issues
* Convert "string" URIs to actual Uri objects
* Don't manually build URIs, hand off to Uri constructor instead
* QoL debug script and snapshot update
* Updates snapshots
* Add windows node 10 job to pipeline config
  • Loading branch information
trevor-scheer authored and JakeDawkins committed Jan 16, 2019
1 parent 57fc50b commit 588470e
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 1,805 deletions.
63 changes: 39 additions & 24 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,70 @@
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript

jobs:
- job: Linux_Node8
# - job: Linux_Node8

pool:
vmImage: "ubuntu 16.04"
# pool:
# vmImage: "ubuntu 16.04"

steps:
- task: NodeTool@0
inputs:
versionSpec: "8.x"
displayName: "Install Node.js"
# steps:
# - task: NodeTool@0
# inputs:
# versionSpec: "8.x"
# displayName: "Install Node.js"

- script: |
npm run azure
displayName: "npm ci && build && test"
# - script: |
# npm run azure
# displayName: "npm ci && test"

- script: |
npm run lint
displayName: "npm run lint"
# - script: |
# npm run lint
# displayName: "npm run lint"

- script: |
ENGINE_API_KEY=$(CHECKS_API_KEY) ./packages/apollo/bin/run client:check
displayName: "Query Check"
# - script: |
# ENGINE_API_KEY=$(CHECKS_API_KEY) ./packages/apollo/bin/run client:check
# displayName: "Query Check"

# - job: Linux_Node10

- job: Linux_Node10
# pool:
# vmImage: "ubuntu 16.04"

# steps:
# - task: NodeTool@0
# inputs:
# versionSpec: "10.x"
# displayName: "Install Node.js"

# - script: |
# npm run azure
# displayName: "npm ci && test"

- job: Windows_Node8

pool:
vmImage: "ubuntu 16.04"
vmImage: "vs2017-win2016"

steps:
- task: NodeTool@0
inputs:
versionSpec: "10.x"
versionSpec: "8.14"
displayName: "Install Node.js"

- script: |
npm run azure
displayName: "npm ci && build && test"
displayName: "npm ci && test"
- job: Windows_Node8
- job: Windows_Node10

pool:
vmImage: "vs2017-win2016"

steps:
- task: NodeTool@0
inputs:
versionSpec: "8.14"
versionSpec: "10.x"
displayName: "Install Node.js"

- script: |
npm run azure
displayName: "npm ci && build && test"
displayName: "npm ci && test"
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"apollo": "./packages/apollo/bin/run"
},
"scripts": {
"azure": "npm ci && npm run build && npm test",
"azure": "npm ci && npm run test:ci",
"clean": "git clean -dfqX -- ./node_modules **/{lib,node_modules}/",
"postinstall": "npm run build",
"build": "lerna run build --stream --scope apollo-env && npm run compile && lerna run build --stream --ignore apollo-env",
Expand All @@ -28,6 +28,7 @@
"postcircle": "npm run lint",
"lint": "prettier --list-different \"packages/*/src/**/*.{js,jsx,ts,tsx}\"",
"lint-fix": "prettier --write \"packages/*/src/**/*.{js,jsx,ts,tsx}\"",
"posttest": "npm run lint",
"release": "npm run clean && npm ci && lerna publish --exact",
"package-extension": "npm run clean && npm ci && lerna run package-extension --stream --scope=vscode-apollo"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,69 +37,6 @@ exports[`client:codegen generates operation IDs for swift files when flag is set
}"
`;

exports[`client:codegen writes TypeScript global types to a custom path when globalTypesFile is set 1`] = `
"/* tslint:disable */
// This file was automatically generated and should not be edited.
import { SomeEnum } from \\"./../../__foo__/bar\\";
// ====================================================
// GraphQL query operation: SimpleQuery
// ====================================================
export interface SimpleQuery {
someEnum: SomeEnum;
}
"
`;

exports[`client:codegen writes TypeScript global types to a custom path when globalTypesFile is set 2`] = `
"/* tslint:disable */
// This file was automatically generated and should not be edited.
//==============================================================
// START Enums and Input Objects
//==============================================================
export enum SomeEnum {
bar = \\"bar\\",
foo = \\"foo\\",
}
//==============================================================
// END Enums and Input Objects
//==============================================================
"
`;

exports[`client:codegen writes TypeScript types into a __generated__ directory next to sources when no output is set 1`] = `
"/* tslint:disable */
// This file was automatically generated and should not be edited.
// ====================================================
// GraphQL query operation: SimpleQuery
// ====================================================
export interface SimpleQuery {
hello: string;
}
"
`;

exports[`client:codegen writes TypeScript types into a __generated__ directory next to sources when no output is set 2`] = `
"/* tslint:disable */
// This file was automatically generated and should not be edited.
//==============================================================
// START Enums and Input Objects
//==============================================================
//==============================================================
// END Enums and Input Objects
//==============================================================
"
`;

exports[`client:codegen writes exact Flow types when the useFlowExactObjects flag is set 1`] = `
"
Expand Down
Loading

0 comments on commit 588470e

Please sign in to comment.