Skip to content

Commit 85eae62

Browse files
committed
Clean up ci-general.yml template
- Use proper `parameters` syntax - Use cleaner indentation - Add decent display names - Remove setting build name for non-PR builds - Remove unused NUnit test results
1 parent 148f423 commit 85eae62

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

.vsts-ci/templates/ci-general.yml

+20-26
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
parameters:
2-
pwsh: true
2+
- name: pwsh
3+
type: boolean
4+
default: true
35

46
steps:
5-
- pwsh: '$PSVersionTable'
6-
displayName: Display PowerShell version information
7+
- pwsh: '$PSVersionTable'
8+
displayName: PowerShell version
79

8-
- pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
9-
displayName: Set Build Name for Non-PR
10-
condition: ne(variables['Build.Reason'], 'PullRequest')
10+
- task: PowerShell@2
11+
displayName: Build and test
12+
inputs:
13+
filePath: tools/azurePipelinesBuild.ps1
14+
pwsh: ${{ parameters.pwsh }}
1115

12-
- task: PowerShell@2
13-
inputs:
14-
filePath: tools/azurePipelinesBuild.ps1
15-
pwsh: ${{ parameters.pwsh }}
16+
- publish: module
17+
artifact: PowerShellEditorServices-Build-$(System.JobId)
18+
displayName: Publish unsigned pipeline artifacts
19+
condition: succeededOrFailed()
1620

17-
- publish: module
18-
artifact: PowerShellEditorServices-Build-$(System.JobId)
19-
displayName: Publish unsigned pipeline artifacts
20-
condition: succeededOrFailed()
21-
22-
- task: PublishTestResults@2
23-
inputs:
24-
testRunner: VSTest
25-
testResultsFiles: '**/*.trx'
26-
condition: succeededOrFailed()
27-
28-
- task: PublishTestResults@2
29-
inputs:
30-
testRunner: NUnit
31-
testResultsFiles: '**/TestResults.xml'
32-
condition: succeededOrFailed()
21+
- task: PublishTestResults@2
22+
displayName: Publish test results
23+
inputs:
24+
testRunner: VSTest
25+
testResultsFiles: '**/*.trx'
26+
condition: succeededOrFailed()

0 commit comments

Comments
 (0)