Skip to content

Use separate test.yaml files files since param passing of pwsh still doesn't seem to fully work correctly #1466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Apr 29, 2020
9 changes: 8 additions & 1 deletion .azure-pipelines-ci/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ stages:
vmImage: vs2017-win2016
Windows_Server2019_PowerShell_Core:
vmImage: windows-2019
pool:
vmImage: $[ variables['vmImage'] ]
steps:
- template: templates/test-pwsh.yaml
- job:
strategy:
matrix:
Windows_Server2016_PowerShell_5_1:
vmImage: vs2017-win2016
pwsh: false
Expand All @@ -43,4 +50,4 @@ stages:
pool:
vmImage: $[ variables['vmImage'] ]
steps:
- template: templates/test.yaml
- template: templates/test-powershell.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
parameters:
- name: pwsh
type: boolean
default: true

steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact: out Folder'
Expand All @@ -13,7 +8,7 @@ steps:
displayName: 'Test'
inputs:
targetType: inline
pwsh: $[ parameters.pwsh ]
pwsh: false
script: |
Import-Module .\tools\appveyor.psm1
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
Expand Down
19 changes: 19 additions & 0 deletions .azure-pipelines-ci/templates/test-pwsh.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact: out Folder'
inputs:
artifactName: out
targetPath: '$(Build.SourcesDirectory)/out'
- task: PowerShell@2
displayName: 'Test'
inputs:
targetType: inline
pwsh: true
script: |
Import-Module .\tools\appveyor.psm1
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
- task: PublishTestResults@2
inputs:
testRunner: NUnit
testResultsFiles: 'TestResults.xml'
condition: succeededOrFailed()