From bf0906ab2b75863f6a7c46d6c27fa696ed46d6ed Mon Sep 17 00:00:00 2001 From: Eric Jizba Date: Mon, 30 Mar 2020 11:36:46 -0700 Subject: [PATCH] Update Azure Pipelines config (#79) --- .azure-pipelines/common/build.yml | 4 ++-- .azure-pipelines/linux/xvfb.init | 4 ++-- .azure-pipelines/main.yml | 29 +++++++++++++++++++++---- .azure-pipelines/windows/intellinav.yml | 7 ------ package-lock.json | 13 ++++++++--- package.json | 2 +- 6 files changed, 40 insertions(+), 19 deletions(-) delete mode 100644 .azure-pipelines/windows/intellinav.yml diff --git a/.azure-pipelines/common/build.yml b/.azure-pipelines/common/build.yml index 725ecde..5a67ea6 100644 --- a/.azure-pipelines/common/build.yml +++ b/.azure-pipelines/common/build.yml @@ -1,8 +1,8 @@ steps: - task: NodeTool@0 - displayName: 'Use Node 8.x' + displayName: 'Use Node 10.x' inputs: - versionSpec: 8.x + versionSpec: 10.x - task: Npm@1 displayName: 'npm install' diff --git a/.azure-pipelines/linux/xvfb.init b/.azure-pipelines/linux/xvfb.init index 7d3bb8f..f2f5e42 100644 --- a/.azure-pipelines/linux/xvfb.init +++ b/.azure-pipelines/linux/xvfb.init @@ -1,6 +1,6 @@ #!/bin/bash # -# COPIED FROM https://github.com/Microsoft/vscode/blob/e29c517386fe6f3a40e2f0ff00effae4919406aa/build/tfs/linux/x64/xvfb.init +# COPIED FROM https://github.com/microsoft/vscode/blob/01e9903967417ba243cec705445eef9ecbfebfea/build/azure-pipelines/linux/xvfb.init # # # /etc/rc.d/init.d/xvfbd @@ -22,7 +22,7 @@ [ "${NETWORKING}" = "no" ] && exit 0 PROG="/usr/bin/Xvfb" -PROG_OPTIONS=":10 -ac" +PROG_OPTIONS=":10 -ac -screen 0 1024x768x24" PROG_OUTPUT="/tmp/Xvfb.out" case "$1" in diff --git a/.azure-pipelines/main.yml b/.azure-pipelines/main.yml index 9ccc3e2..f3d146a 100644 --- a/.azure-pipelines/main.yml +++ b/.azure-pipelines/main.yml @@ -1,16 +1,19 @@ +variables: + ${{ if eq(variables['Build.Reason'], 'Schedule') }}: + ENABLE_LONG_RUNNING_TESTS: true + jobs: - job: Windows pool: - vmImage: VS2017-Win2016 + vmImage: windows-latest steps: - template: common/build.yml - template: common/lint.yml - template: common/test.yml - - template: windows/intellinav.yml - job: Linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest steps: - template: common/build.yml - template: common/publish-vsix.yml # Only publish vsix from linux build since we use this to release and want to stay consistent @@ -19,8 +22,26 @@ jobs: - job: macOS pool: - vmImage: macOS 10.13 + vmImage: macOS-latest steps: - template: common/build.yml - template: common/lint.yml - template: common/test.yml + +trigger: + branches: + include: + - '*' + +pr: + branches: + include: + - '*' + +schedules: +- cron: "30 11 * * *" + displayName: Nightly at 4:30 PT + always: true # Run even when there are no code changes + branches: + include: + - master diff --git a/.azure-pipelines/windows/intellinav.yml b/.azure-pipelines/windows/intellinav.yml deleted file mode 100644 index bbd17e4..0000000 --- a/.azure-pipelines/windows/intellinav.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- task: RichCodeNavIndexer@0 - inputs: - serviceConnection: 'azuretools-dev' # name of the IntelliNav service connection - languages: 'typescript' # languages in your repo, separated by commas - githubServiceConnection: 'GitHub connection' # if your repo is on GitHub, this is the name of the GitHub service connection (GitHub organization by default) - continueOnError: true \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1d0a27c..df1bf62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -105,9 +105,9 @@ "dev": true }, "@types/node": { - "version": "8.10.49", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.49.tgz", - "integrity": "sha512-YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==" + "version": "10.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz", + "integrity": "sha512-gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q==" }, "@types/request": { "version": "2.48.1", @@ -408,6 +408,13 @@ "uuid": "^3.1.0", "xmldom": ">= 0.1.x", "xpath.js": "~1.1.0" + }, + "dependencies": { + "@types/node": { + "version": "8.10.59", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz", + "integrity": "sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==" + } } }, "agent-base": { diff --git a/package.json b/package.json index 79d9a20..96a6bf0 100644 --- a/package.json +++ b/package.json @@ -542,7 +542,7 @@ "devDependencies": { "@types/fs-extra": "^4.0.3", "@types/gulp": "^4.0.6", - "@types/node": "^8.10.25", + "@types/node": "^10.0.0", "@types/request": "^2.47.0", "@types/request-promise": "^4.1.43", "@types/swagger-parser": "^4.0.3",