From c9c3fea8fc32286e27492605b5c8ec37fe12cecc Mon Sep 17 00:00:00 2001 From: ev1stensberg Date: Tue, 5 Feb 2019 00:37:48 +0100 Subject: [PATCH] tests: azure pipelines tests: azure tests: azure chore: try to fix symlinks chore: try to fix symlinks chore: remove ci opt chore: remove ci opt chore: remove ci opt chore: remove ci opt chore: remove ci opt chore: remove ci opt chore: remove ci opt chore: remove ci opt chore: :) chore: :) chore: :) chore: :) chore: :) chore: :) chore: :) chore: :D --- azure-pipelines-template.yml | 38 ++++++++++ azure-pipelines.yml | 130 +++++------------------------------ package-lock.json | 88 +++++++++++++++++------- package.json | 9 +-- 4 files changed, 122 insertions(+), 143 deletions(-) create mode 100644 azure-pipelines-template.yml diff --git a/azure-pipelines-template.yml b/azure-pipelines-template.yml new file mode 100644 index 00000000000..e5423adfb18 --- /dev/null +++ b/azure-pipelines-template.yml @@ -0,0 +1,38 @@ +jobs: + - job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + strategy: + maxParallel: 3 + matrix: + node-10: + node_version: ^10.10.0 + node-8: + node_version: ^8.12.0 + node-6: + node_version: ^6.14.4 + steps: + - task: NodeTool@0 + displayName: "Install Node.js" + inputs: + versionSpec: $(node_version) + - script: | + npm install -g npm@latest + displayName: "Install npm" + - script: | + npm install + npm run bootstrap + displayName: "Lerna bootstrap" + - script: | + npm run test + displayName: "Run tests" + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + inputs: + testResultsFiles: '**junit*.xml' + testRunTitle: TestRun $ {{ parameters.name }} $(node_version) + - task: PublishCodeCoverageResults@1 + displayName: 'Publish code coverage results' + inputs: + codeCoverageTool: 'cobertura' + summaryFileLocation: '**/coverage/cobertura-coverage.xml' \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5095985bfd4..b29db6760dd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,117 +1,19 @@ jobs: - - job: linux - pool: - vmImage: ubuntu-16.04 - strategy: - maxParallel: 3 - matrix: - node-10: - node_version: ^10.10.0 - node-8: - node_version: ^8.12.0 - node-6: - node_version: ^6.14.4 - steps: - - task: NodeTool@0 - displayName: "Install Node.js" - inputs: - versionSpec: $(node_version) - - script: | - npm install -g npm@latest - displayName: "Install npm" - - script: | - npm ci - displayName: "Install dependencies" - - script: | - ./node_modules/.bin/lerna bootstrap - displayName: "Lerna bootstrap" - - script: | - npm test - displayName: "Run tests" - - task: PublishTestResults@2 - displayName: 'Publish Test Results' - inputs: - testResultsFiles: '**junit*.xml' - testRunTitle: TestRun ${{ parameters.name }} $(node_version) - - task: PublishCodeCoverageResults@1 - displayName: 'Publish code coverage results' - inputs: - codeCoverageTool: 'cobertura' - summaryFileLocation: '**/coverage/cobertura-coverage.xml' - - job: macos - pool: - vmImage: "macOS 10.13" - strategy: - maxParallel: 3 - matrix: - node-10: - node_version: ^10.10.0 - node-8: - node_version: ^8.12.0 - steps: - - task: NodeTool@0 - displayName: "Install Node.js" - inputs: - versionSpec: $(node_version) - - script: | - npm install -g npm@latest - displayName: "Install npm" - - script: | - npm ci - displayName: "Install dependencies" - - script: | - ./node_modules/.bin/lerna bootstrap - displayName: "Lerna bootstrap" - - script: | - npm test - displayName: "Run tests" - - task: PublishTestResults@2 - displayName: 'Publish Test Results' - inputs: - testResultsFiles: '**junit*.xml' - testRunTitle: TestRun ${{ parameters.name }} $(node_version) - - task: PublishCodeCoverageResults@1 - displayName: 'Publish code coverage results' - inputs: - codeCoverageTool: 'cobertura' - summaryFileLocation: '**/coverage/cobertura-coverage.xml' - - job: windows - pool: - vmImage: vs2017-win2016 - strategy: - maxParallel: 3 - matrix: - node-8: - node_version: ^8.12.0 - node-6: - node_version: ^6.14.4 - steps: - - task: NodeTool@0 - displayName: "Install Node.js" - inputs: - versionSpec: $(node_version) - - script: | - npm install -g npm@latest - displayName: "Install npm" - - script: | - npm ci - displayName: "Install dependencies" - - script: | - ./node_modules/.bin/lerna.cmd bootstrap - displayName: "Lerna bootstrap" - - script: | - npm test - displayName: "Run tests" - - task: PublishTestResults@2 - displayName: 'Publish Test Results' - inputs: - testResultsFiles: '**junit*.xml' - testRunTitle: TestRun ${{ parameters.name }} $(node_version) - - task: PublishCodeCoverageResults@1 - displayName: 'Publish code coverage results' - inputs: - codeCoverageTool: 'cobertura' - summaryFileLocation: '**coverage/cobertura-coverage.xml' +- template: azure-pipelines-template.yml + parameters: + name: macOS + vmImage: macOS-10.13 + +- template: azure-pipelines-template.yml + parameters: + name: Linux + vmImage: ubuntu-16.04 + +# TODO: enable when windows symlinks in monorepos work... +# - template: azure-pipelines-template.yml +# parameters: +# name: Windows +# vmImage: vs2017-win2016 variables: - nproc: 4 \ No newline at end of file + nproc: 3 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 644fde482b8..7a8fe8f96b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1402,21 +1402,21 @@ } }, "inquirer": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz", - "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz", + "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", - "external-editor": "^3.0.0", + "external-editor": "^3.0.3", "figures": "^2.0.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "mute-stream": "0.0.7", "run-async": "^2.2.0", - "rxjs": "^6.1.0", + "rxjs": "^6.4.0", "string-width": "^2.1.0", "strip-ansi": "^5.0.0", "through": "^2.3.6" @@ -1456,6 +1456,15 @@ "is-promise": "^2.1.0" } }, + "rxjs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", + "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "strip-ansi": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", @@ -6961,7 +6970,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6982,12 +6992,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7002,17 +7014,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7129,7 +7144,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7141,6 +7157,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7155,6 +7172,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7162,12 +7180,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7186,6 +7206,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7266,7 +7287,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7278,6 +7300,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7363,7 +7386,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7399,6 +7423,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7418,6 +7443,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7461,12 +7487,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -12447,6 +12475,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -12771,7 +12800,8 @@ "is-buffer": { "version": "1.1.6", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "is-builtin-module": { "version": "1.0.0", @@ -12870,6 +12900,7 @@ "version": "3.2.2", "bundled": true, "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -12916,7 +12947,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "lru-cache": { "version": "4.1.3", @@ -13182,7 +13214,8 @@ "repeat-string": { "version": "1.6.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "require-directory": { "version": "2.1.1", @@ -17747,9 +17780,9 @@ } }, "typescript": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", - "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.1.tgz", + "integrity": "sha512-cTmIDFW7O0IHbn1DPYjkiebHxwtCMU+eTy30ZtJNBPF9j2O1ITu5XH2YnBeVRKWHqF+3JQwWJv0Q0aUgX8W7IA==", "dev": true }, "typescript-eslint-parser": { @@ -18305,6 +18338,11 @@ } } }, + "webpack-cli-scripts": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/webpack-cli-scripts/-/webpack-cli-scripts-1.0.2.tgz", + "integrity": "sha512-U/ggmuoxclQgwtot3saL/nfVioJZ3CIYrontvStCfksIE+j7O66LVd29hgPP6cUBVMOnqyaELCsqUf9arNCpMQ==" + }, "webpack-dev-middleware": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", diff --git a/package.json b/package.json index 2b5227c6d51..e970915b406 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build": "tsc", "bundlesize": "bundlesize", "changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile CHANGELOG.md --same-file", - "clean:all": "rimraf node_modules package-lock.json packages/*/{node_modules,package-lock.json}", + "clean:all": "rimraf node_modules packages/*/{node_modules}", "commit": "git-cz", "docs": "typedoc", "format": "prettier-eslint ./bin/*.js ./test/**/*.js ./packages/**/*.js --write", @@ -44,7 +44,7 @@ "travis:lint": "npm run build && npm run lint && npm run tslint", "tslint": "tslint -c tslint.json \"packages/**/*.ts\"", "watch": "npm run build && tsc -w", - "postinstall": "./scripts/opencollective.sh" + "postinstall": "webpack-cli-donate" }, "husky": { "hooks": { @@ -117,6 +117,7 @@ "loader-utils": "^1.1.0", "supports-color": "^5.5.0", "v8-compile-cache": "^2.0.2", + "webpack-cli-scripts": "^1.0.2", "yargs": "^12.0.4" }, "peerDependencies": { @@ -143,7 +144,7 @@ "jest": "^23.6.0", "jest-cli": "^23.6.0", "jest-junit": "^5.0.0", - "lerna": "^3.4.3", + "lerna": "^3.10.7", "lint-staged": "7.x.x", "nyc": "^13.1.0", "prettier-eslint-cli": "^4.7.1", @@ -155,7 +156,7 @@ "tslint": "^5.11.0", "typedoc": "^0.13.0", "typedoc-plugin-monorepo": "^0.1.0", - "typescript": "^3.1.6", + "typescript": "^3.3.1", "webpack": "4.x.x", "webpack-dev-server": "^3.1.10" },