From fa340ad14b7fe8f8f708abc40f0c10b59f603960 Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Sat, 13 Jul 2019 09:45:26 -0300 Subject: [PATCH] Replace the path of the pipeline with the root (#1841) --- .../sample-assistant/pipeline/_sample-assistant.yml | 12 ++++++------ .../sample-skill/pipeline/_sample-skill.yml | 12 ++++++------ .../sample-assistant/pipeline/sample-assistant.yml | 12 ++++++------ .../samples/sample-skill/pipeline/sample-skill.yml | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/pipeline/_sample-assistant.yml b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/pipeline/_sample-assistant.yml index 07aed75877..0dcf03cd03 100644 --- a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/pipeline/_sample-assistant.yml +++ b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/pipeline/_sample-assistant.yml @@ -17,7 +17,7 @@ steps: displayName: 'npm install' inputs: # if your working directory is not root, you may change the following path - workingDir: '<%=assistantName%>' + workingDir: './' verbose: false - task: Npm@1 @@ -25,7 +25,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: '<%=assistantName%>' + workingDir: './' verbose: false customCommand: 'run build' @@ -34,7 +34,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: '<%=assistantName%>' + workingDir: './' verbose: false customCommand: 'run test-coverage-ci' @@ -43,7 +43,7 @@ steps: inputs: testResultsFiles: 'test-results.xml' # if your working directory is not root, you may change the following path - searchFolder: '<%=assistantName%>' + searchFolder: './' failTaskOnFailedTests: true - task: PublishCodeCoverageResults@1 @@ -51,5 +51,5 @@ steps: inputs: codeCoverageTool: Cobertura # if your working directory is not root, you may change the following paths - summaryFileLocation: '<%=assistantName%>/coverage/cobertura-coverage.xml' - reportDirectory: '<%=assistantName%>/coverage/' \ No newline at end of file + summaryFileLocation: './coverage/cobertura-coverage.xml' + reportDirectory: './coverage/' \ No newline at end of file diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/pipeline/_sample-skill.yml b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/pipeline/_sample-skill.yml index 5eb5505a7d..47f75910c9 100644 --- a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/pipeline/_sample-skill.yml +++ b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/pipeline/_sample-skill.yml @@ -18,7 +18,7 @@ steps: displayName: 'npm install' inputs: # if your working directory is not root, you may change the following path - workingDir: '<%=skillName%>' + workingDir: './' verbose: false - task: Npm@1 @@ -26,7 +26,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: '<%=skillName%>' + workingDir: './' verbose: false customCommand: 'run build' @@ -35,7 +35,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: '<%=skillName%>' + workingDir: './' verbose: false customCommand: 'run test-coverage-ci' @@ -44,7 +44,7 @@ steps: inputs: testResultsFiles: 'test-results.xml' # if your working directory is not root, you may change the following path - searchFolder: '<%=skillName%>' + searchFolder: './' failTaskOnFailedTests: true - task: PublishCodeCoverageResults@1 @@ -52,5 +52,5 @@ steps: inputs: codeCoverageTool: Cobertura # if your working directory is not root, you may change the following paths - summaryFileLocation: '<%=skillName%>/coverage/cobertura-coverage.xml' - reportDirectory: '<%=skillName%>/coverage/' \ No newline at end of file + summaryFileLocation: './coverage/cobertura-coverage.xml' + reportDirectory: './coverage/' \ No newline at end of file diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/pipeline/sample-assistant.yml b/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/pipeline/sample-assistant.yml index 0bb852ce11..0dcf03cd03 100644 --- a/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/pipeline/sample-assistant.yml +++ b/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/pipeline/sample-assistant.yml @@ -17,7 +17,7 @@ steps: displayName: 'npm install' inputs: # if your working directory is not root, you may change the following path - workingDir: 'sample-assistant' + workingDir: './' verbose: false - task: Npm@1 @@ -25,7 +25,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: 'sample-assistant' + workingDir: './' verbose: false customCommand: 'run build' @@ -34,7 +34,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: 'sample-assistant' + workingDir: './' verbose: false customCommand: 'run test-coverage-ci' @@ -43,7 +43,7 @@ steps: inputs: testResultsFiles: 'test-results.xml' # if your working directory is not root, you may change the following path - searchFolder: 'sample-assistant' + searchFolder: './' failTaskOnFailedTests: true - task: PublishCodeCoverageResults@1 @@ -51,5 +51,5 @@ steps: inputs: codeCoverageTool: Cobertura # if your working directory is not root, you may change the following paths - summaryFileLocation: 'sample-assistant/coverage/cobertura-coverage.xml' - reportDirectory: 'sample-assistant/coverage/' \ No newline at end of file + summaryFileLocation: './coverage/cobertura-coverage.xml' + reportDirectory: './coverage/' \ No newline at end of file diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/pipeline/sample-skill.yml b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/pipeline/sample-skill.yml index 92e9da1695..47f75910c9 100644 --- a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/pipeline/sample-skill.yml +++ b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/pipeline/sample-skill.yml @@ -18,7 +18,7 @@ steps: displayName: 'npm install' inputs: # if your working directory is not root, you may change the following path - workingDir: 'sample-skill' + workingDir: './' verbose: false - task: Npm@1 @@ -26,7 +26,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: 'sample-skill' + workingDir: './' verbose: false customCommand: 'run build' @@ -35,7 +35,7 @@ steps: inputs: command: custom # if your working directory is not root, you may change the following path - workingDir: 'sample-skill' + workingDir: './' verbose: false customCommand: 'run test-coverage-ci' @@ -44,7 +44,7 @@ steps: inputs: testResultsFiles: 'test-results.xml' # if your working directory is not root, you may change the following path - searchFolder: 'sample-skill' + searchFolder: './' failTaskOnFailedTests: true - task: PublishCodeCoverageResults@1 @@ -52,5 +52,5 @@ steps: inputs: codeCoverageTool: Cobertura # if your working directory is not root, you may change the following paths - summaryFileLocation: 'sample-skill/coverage/cobertura-coverage.xml' - reportDirectory: 'sample-skill/coverage/' \ No newline at end of file + summaryFileLocation: './coverage/cobertura-coverage.xml' + reportDirectory: './coverage/' \ No newline at end of file