From 25c930fb44b72ffbe17563a46fe3e7063fec8a42 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Wed, 27 Mar 2019 16:37:53 -0700 Subject: [PATCH] Attempt to fix Azure Pipelines Cl. --- Extension/jobs/build.windows.yml | 124 +++++++++++++-------------- Extension/jobs/build.yml | 142 +++++++++++++++---------------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/Extension/jobs/build.windows.yml b/Extension/jobs/build.windows.yml index 829c4a40c..018d63b4c 100644 --- a/Extension/jobs/build.windows.yml +++ b/Extension/jobs/build.windows.yml @@ -1,62 +1,62 @@ -parameters: - name: '' - pool: '' - -jobs: -- job: Windows - pool: - vmImage: 'vs2017-win2016' - - steps: - - task: NodeTool@0 - displayName: 'Use Node 8.x' - inputs: - versionSpec: 8.x - - - script: npm install - displayName: "Install Dependencies" - workingDirectory: '$(Build.SourcesDirectory)\Extension' - - - script: npm run compile - displayName: "Compile Sources" - workingDirectory: '$(Build.SourcesDirectory)\Extension' - - - script: npm run pr-check - displayName: 'Validate Extension/package.json' - workingDirectory: '$(Build.SourcesDirectory)\Extension' - - - script: npm run tslint - displayName: 'Run Linter' - workingDirectory: '$(Build.SourcesDirectory)\Extension' - - - script: 'npm run unitTests' - displayName: 'Run unit tests' - workingDirectory: '$(Build.SourcesDirectory)\Extension' - continueOnError: true - - - script: 'copy "$(Build.SourcesDirectory)\Extension\out\test\integrationTests\MockDebugger\debugAdapterDescriptorFactory.js" "$(Build.SourcesDirectory)\Extension\out\src\Debugger\debugAdapterDescriptorFactory.js" /Y' - displayName: Replace Debug Adapter Descriptor Factory - - - script: 'node node_modules/vscode/bin/test' - displayName: 'Run debug integration tests' - workingDirectory: '$(Build.SourcesDirectory)\Extension' - continueOnError: true - env: - CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\debug' - CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension' - CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject' - CODE_DISABLE_EXTENSIONS: 1 - - - script: 'node node_modules/vscode/bin/test' - displayName: 'Run languageServer integration tests' - workingDirectory: '$(Build.SourcesDirectory)\Extension' - continueOnError: true - env: - CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\languageServer' - CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension' - CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject' - CODE_DISABLE_EXTENSIONS: 1 - -- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - continueOnError: true \ No newline at end of file +parameters: + name: '' + pool: '' + +jobs: +- job: Windows + pool: + vmImage: 'vs2017-win2016' + + steps: + - task: NodeTool@0 + displayName: 'Use Node 8.x' + inputs: + versionSpec: 8.x + + - script: npm install + displayName: "Install Dependencies" + workingDirectory: '$(Build.SourcesDirectory)\Extension' + + - script: npm run compile + displayName: "Compile Sources" + workingDirectory: '$(Build.SourcesDirectory)\Extension' + + - script: npm run pr-check + displayName: 'Validate Extension/package.json' + workingDirectory: '$(Build.SourcesDirectory)\Extension' + + - script: npm run tslint + displayName: 'Run Linter' + workingDirectory: '$(Build.SourcesDirectory)\Extension' + + - script: 'npm run unitTests' + displayName: 'Run unit tests' + workingDirectory: '$(Build.SourcesDirectory)\Extension' + continueOnError: true + + - script: 'copy "$(Build.SourcesDirectory)\Extension\out\test\integrationTests\MockDebugger\debugAdapterDescriptorFactory.js" "$(Build.SourcesDirectory)\Extension\out\src\Debugger\debugAdapterDescriptorFactory.js" /Y' + displayName: Replace Debug Adapter Descriptor Factory + + - script: 'node node_modules/vscode/bin/test' + displayName: 'Run debug integration tests' + workingDirectory: '$(Build.SourcesDirectory)\Extension' + continueOnError: true + env: + CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\debug' + CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension' + CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject' + CODE_DISABLE_EXTENSIONS: 1 + + - script: 'node node_modules/vscode/bin/test' + displayName: 'Run languageServer integration tests' + workingDirectory: '$(Build.SourcesDirectory)\Extension' + continueOnError: true + env: + CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\languageServer' + CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension' + CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject' + CODE_DISABLE_EXTENSIONS: 1 + + - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: 'Component Detection' + continueOnError: true \ No newline at end of file diff --git a/Extension/jobs/build.yml b/Extension/jobs/build.yml index 44a31a7a5..e8ecbb6d1 100644 --- a/Extension/jobs/build.yml +++ b/Extension/jobs/build.yml @@ -1,71 +1,71 @@ -parameters: - name: '' - pool: '' - -jobs: -- job: ${{ parameters.name }} - pool: ${{ parameters.pool }} - - steps: - - task: NodeTool@0 - displayName: 'Use Node 8.x' - inputs: - versionSpec: 8.x - - - script: npm install - displayName: "Install Dependencies" - workingDirectory: '$(Build.SourcesDirectory)/Extension' - - - script: npm run compile - displayName: "Compile Sources" - workingDirectory: '$(Build.SourcesDirectory)/Extension' - - - script: npm run pr-check - displayName: 'Validate Extension/package.json' - workingDirectory: '$(Build.SourcesDirectory)/Extension' - - - script: npm run tslint - displayName: 'Run Linter' - workingDirectory: '$(Build.SourcesDirectory)/Extension' - - - script: 'npm run unitTests' - displayName: 'Run unit tests' - workingDirectory: '$(Build.SourcesDirectory)/Extension' - continueOnError: true - - - script: | - set -e - /usr/bin/Xvfb :10 -ac >> /tmp/Xvfb.out 2>&1 & - disown -ar - displayName: 'Start xvfb' - - - script: | - cp $(Build.SourcesDirectory)/Extension/out/test/integrationTests/MockDebugger/debugAdapterDescriptorFactory.js $(Build.SourcesDirectory)/Extension/out/src/Debugger/debugAdapterDescriptorFactory.js - displayName: Replace Debug Adapter Descriptor Factory - - - script: 'node node_modules/vscode/bin/test' - displayName: 'Run debug integration tests' - workingDirectory: '$(Build.SourcesDirectory)/Extension' - continueOnError: true - env: - MOCK_DEBUG: 1 - DISPLAY: :10 - CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/debug' - CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension' - CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject' - CODE_DISABLE_EXTENSIONS: 1 - - - script: 'node node_modules/vscode/bin/test' - displayName: 'Run languageServer integration tests' - workingDirectory: '$(Build.SourcesDirectory)/Extension' - continueOnError: true - env: - DISPLAY: :10 - CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/languageServer' - CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension' - CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject' - CODE_DISABLE_EXTENSIONS: 1 - -- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - continueOnError: true \ No newline at end of file +parameters: + name: '' + pool: '' + +jobs: +- job: ${{ parameters.name }} + pool: ${{ parameters.pool }} + + steps: + - task: NodeTool@0 + displayName: 'Use Node 8.x' + inputs: + versionSpec: 8.x + + - script: npm install + displayName: "Install Dependencies" + workingDirectory: '$(Build.SourcesDirectory)/Extension' + + - script: npm run compile + displayName: "Compile Sources" + workingDirectory: '$(Build.SourcesDirectory)/Extension' + + - script: npm run pr-check + displayName: 'Validate Extension/package.json' + workingDirectory: '$(Build.SourcesDirectory)/Extension' + + - script: npm run tslint + displayName: 'Run Linter' + workingDirectory: '$(Build.SourcesDirectory)/Extension' + + - script: 'npm run unitTests' + displayName: 'Run unit tests' + workingDirectory: '$(Build.SourcesDirectory)/Extension' + continueOnError: true + + - script: | + set -e + /usr/bin/Xvfb :10 -ac >> /tmp/Xvfb.out 2>&1 & + disown -ar + displayName: 'Start xvfb' + + - script: | + cp $(Build.SourcesDirectory)/Extension/out/test/integrationTests/MockDebugger/debugAdapterDescriptorFactory.js $(Build.SourcesDirectory)/Extension/out/src/Debugger/debugAdapterDescriptorFactory.js + displayName: Replace Debug Adapter Descriptor Factory + + - script: 'node node_modules/vscode/bin/test' + displayName: 'Run debug integration tests' + workingDirectory: '$(Build.SourcesDirectory)/Extension' + continueOnError: true + env: + MOCK_DEBUG: 1 + DISPLAY: :10 + CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/debug' + CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension' + CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject' + CODE_DISABLE_EXTENSIONS: 1 + + - script: 'node node_modules/vscode/bin/test' + displayName: 'Run languageServer integration tests' + workingDirectory: '$(Build.SourcesDirectory)/Extension' + continueOnError: true + env: + DISPLAY: :10 + CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/languageServer' + CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension' + CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject' + CODE_DISABLE_EXTENSIONS: 1 + + - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: 'Component Detection' + continueOnError: true \ No newline at end of file