From 69f13a2f90098fe566d379e51bf97db9e1bb7226 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 6 Jul 2021 15:50:10 -0400 Subject: [PATCH 1/3] patching black --- eng/pipelines/templates/steps/analyze.yml | 1 - eng/pipelines/templates/steps/run_black.yml | 37 +++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml index 699fc644b9de..a9a3c6ad4a0d 100644 --- a/eng/pipelines/templates/steps/analyze.yml +++ b/eng/pipelines/templates/steps/analyze.yml @@ -102,7 +102,6 @@ steps: parameters: ServiceDirectory: ${{ parameters.ServiceDirectory }} BuildTargetingString: ${{ parameters.BuildTargetingString }} - ValidateFormatting: ${{ parameters.ValidateFormatting }} - template: run_black.yml parameters: diff --git a/eng/pipelines/templates/steps/run_black.yml b/eng/pipelines/templates/steps/run_black.yml index f3af5bba1298..71234b35dd0c 100644 --- a/eng/pipelines/templates/steps/run_black.yml +++ b/eng/pipelines/templates/steps/run_black.yml @@ -5,23 +5,24 @@ parameters: EnvVars: {} steps: - - task: UsePythonVersion@0 - displayName: 'Use Python 3.7' - inputs: - versionSpec: '3.7' - condition: succeededOrFailed() + - ${{ if parameters.ValidateFormatting }}: + - task: UsePythonVersion@0 + displayName: 'Use Python 3.7' + inputs: + versionSpec: '3.7' + condition: succeededOrFailed() - - script: | - pip install -r eng/ci_tools.txt - displayName: 'Prep Environment' - condition: succeededOrFailed() + - script: | + pip install -r eng/ci_tools.txt + displayName: 'Prep Environment' + condition: succeededOrFailed() - - task: PythonScript@0 - displayName: 'Run Black' - inputs: - scriptPath: 'scripts/devops_tasks/validate_formatting.py' - arguments: >- - --service_directory="${{ parameters.ServiceDirectory }}" - --validate="${{ parameters.ValidateFormatting }}" - env: ${{ parameters.EnvVars }} - condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'],'true')) \ No newline at end of file + - task: PythonScript@0 + displayName: 'Run Black' + inputs: + scriptPath: 'scripts/devops_tasks/validate_formatting.py' + arguments: >- + --service_directory="${{ parameters.ServiceDirectory }}" + --validate="${{ parameters.ValidateFormatting }}" + env: ${{ parameters.EnvVars }} + condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'],'true')) \ No newline at end of file From 21eb54b0d878456703242846963dbb913d28c511 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 6 Jul 2021 15:53:55 -0400 Subject: [PATCH 2/3] fix spacing --- eng/pipelines/templates/steps/run_black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/run_black.yml b/eng/pipelines/templates/steps/run_black.yml index 71234b35dd0c..3903e55da301 100644 --- a/eng/pipelines/templates/steps/run_black.yml +++ b/eng/pipelines/templates/steps/run_black.yml @@ -9,7 +9,7 @@ steps: - task: UsePythonVersion@0 displayName: 'Use Python 3.7' inputs: - versionSpec: '3.7' + versionSpec: '3.7' condition: succeededOrFailed() - script: | From fc1be114c006d5a6cc067b2b05ace8f896b3ea7a Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 6 Jul 2021 16:15:27 -0400 Subject: [PATCH 3/3] moving conditional --- eng/pipelines/templates/steps/analyze.yml | 11 +++--- eng/pipelines/templates/steps/run_black.yml | 37 ++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml index a9a3c6ad4a0d..87bb4a225481 100644 --- a/eng/pipelines/templates/steps/analyze.yml +++ b/eng/pipelines/templates/steps/analyze.yml @@ -103,11 +103,12 @@ steps: ServiceDirectory: ${{ parameters.ServiceDirectory }} BuildTargetingString: ${{ parameters.BuildTargetingString }} - - template: run_black.yml - parameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - BuildTargetingString: ${{ parameters.BuildTargetingString }} - ValidateFormatting: ${{ parameters.ValidateFormatting }} + - ${{ if parameters.ValidateFormatting }}: + - template: run_black.yml + parameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} + BuildTargetingString: ${{ parameters.BuildTargetingString }} + ValidateFormatting: ${{ parameters.ValidateFormatting }} - task: DownloadPipelineArtifact@2 condition: succeededOrFailed() diff --git a/eng/pipelines/templates/steps/run_black.yml b/eng/pipelines/templates/steps/run_black.yml index 3903e55da301..f3af5bba1298 100644 --- a/eng/pipelines/templates/steps/run_black.yml +++ b/eng/pipelines/templates/steps/run_black.yml @@ -5,24 +5,23 @@ parameters: EnvVars: {} steps: - - ${{ if parameters.ValidateFormatting }}: - - task: UsePythonVersion@0 - displayName: 'Use Python 3.7' - inputs: - versionSpec: '3.7' - condition: succeededOrFailed() + - task: UsePythonVersion@0 + displayName: 'Use Python 3.7' + inputs: + versionSpec: '3.7' + condition: succeededOrFailed() - - script: | - pip install -r eng/ci_tools.txt - displayName: 'Prep Environment' - condition: succeededOrFailed() + - script: | + pip install -r eng/ci_tools.txt + displayName: 'Prep Environment' + condition: succeededOrFailed() - - task: PythonScript@0 - displayName: 'Run Black' - inputs: - scriptPath: 'scripts/devops_tasks/validate_formatting.py' - arguments: >- - --service_directory="${{ parameters.ServiceDirectory }}" - --validate="${{ parameters.ValidateFormatting }}" - env: ${{ parameters.EnvVars }} - condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'],'true')) \ No newline at end of file + - task: PythonScript@0 + displayName: 'Run Black' + inputs: + scriptPath: 'scripts/devops_tasks/validate_formatting.py' + arguments: >- + --service_directory="${{ parameters.ServiceDirectory }}" + --validate="${{ parameters.ValidateFormatting }}" + env: ${{ parameters.EnvVars }} + condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'],'true')) \ No newline at end of file