Skip to content

Commit c005599

Browse files
bergmeisterChristoph Bergmeister
and
Christoph Bergmeister
authored
Use separate test.yaml files files since param passing of pwsh still doesn't seem to fully work correctly (#1466)
* Pass pwsh parameter explicitly as runtime parameter * fix yaml * try use compile time expression * cannot cast to bool, use string * compile time expressions everywhere * Revert "compile time expressions everywhere" This reverts commit 517ba15. * runtime expr * try use $() expression and don't pass parameter * try re-add param section * try use bracket again * try split test template # Conflicts: # .azure-pipelines-ci/templates/test-powershell.yaml * re-enable build * remove duplicated entry Co-authored-by: Christoph Bergmeister <[email protected]>
1 parent 7bb24d2 commit c005599

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

.azure-pipelines-ci/ci.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ stages:
3434
vmImage: vs2017-win2016
3535
Windows_Server2019_PowerShell_Core:
3636
vmImage: windows-2019
37+
pool:
38+
vmImage: $[ variables['vmImage'] ]
39+
steps:
40+
- template: templates/test-pwsh.yaml
41+
- job:
42+
strategy:
43+
matrix:
3744
Windows_Server2016_PowerShell_5_1:
3845
vmImage: vs2017-win2016
3946
pwsh: false
@@ -43,4 +50,4 @@ stages:
4350
pool:
4451
vmImage: $[ variables['vmImage'] ]
4552
steps:
46-
- template: templates/test.yaml
53+
- template: templates/test-powershell.yaml

.azure-pipelines-ci/templates/test.yaml renamed to .azure-pipelines-ci/templates/test-powershell.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
parameters:
2-
- name: pwsh
3-
type: boolean
4-
default: true
5-
61
steps:
72
- task: DownloadPipelineArtifact@2
83
displayName: 'Download Pipeline Artifact: out Folder'
@@ -13,7 +8,7 @@ steps:
138
displayName: 'Test'
149
inputs:
1510
targetType: inline
16-
pwsh: $[ parameters.pwsh ]
11+
pwsh: false
1712
script: |
1813
Import-Module .\tools\appveyor.psm1
1914
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
steps:
2+
- task: DownloadPipelineArtifact@2
3+
displayName: 'Download Pipeline Artifact: out Folder'
4+
inputs:
5+
artifactName: out
6+
targetPath: '$(Build.SourcesDirectory)/out'
7+
- task: PowerShell@2
8+
displayName: 'Test'
9+
inputs:
10+
targetType: inline
11+
pwsh: true
12+
script: |
13+
Import-Module .\tools\appveyor.psm1
14+
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
15+
- task: PublishTestResults@2
16+
inputs:
17+
testRunner: NUnit
18+
testResultsFiles: 'TestResults.xml'
19+
condition: succeededOrFailed()

0 commit comments

Comments
 (0)