Skip to content

Commit f262d80

Browse files
committed
Update azure pipelines files
1 parent 62675f0 commit f262d80

11 files changed

Lines changed: 30 additions & 27 deletions

File tree

Dibix.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-pipeline-templates",
5959
build\azure-pipelines-template\pack-dotnet.yml = build\azure-pipelines-template\pack-dotnet.yml
6060
build\azure-pipelines-template\pack.yml = build\azure-pipelines-template\pack.yml
6161
build\azure-pipelines-template\publish-coverage.yml = build\azure-pipelines-template\publish-coverage.yml
62-
build\azure-pipelines-template\publish.yml = build\azure-pipelines-template\publish.yml
62+
build\azure-pipelines-template\publish-artifact.yml = build\azure-pipelines-template\publish-artifact.yml
6363
build\azure-pipelines-template\restore.yml = build\azure-pipelines-template\restore.yml
6464
build\azure-pipelines-template\run.yml = build\azure-pipelines-template\run.yml
6565
build\azure-pipelines-template\test-dotnet-cobertura.yml = build\azure-pipelines-template\test-dotnet-cobertura.yml

build/azure-pipelines-template/build-dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ steps:
1616
arguments: >
1717
--configuration ${{ parameters.configuration }}
1818
--no-restore
19-
/bl:$(Build.ArtifactStagingDirectory)/build/logs/${{ parameters.configuration }}/${{ parameters.project }}.binlog
19+
-bl:$(Build.ArtifactStagingDirectory)/build/logs/${{ parameters.configuration }}/${{ parameters.project }}.binlog

build/azure-pipelines-template/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
- Dibix.Testing
1919
configuration: ${{ parameters.configuration }}
2020

21-
- template: publish.yml
21+
- template: publish-artifact.yml
2222
parameters:
2323
artifact: Build output ($(operatingSystem))
2424
folder: build

build/azure-pipelines-template/pack-dotnet.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
steps:
1212
- ${{ each project in parameters.projects }}:
1313
- task: DotNetCoreCLI@2
14-
displayName: 📦 Pack ${{ project }}
14+
displayName: 📦 Pack ${{ project }} (${{ parameters.configuration }})
1515
inputs:
1616
command: custom
1717
projects: src/${{ project }}
1818
custom: pack
19-
arguments: --no-build --output $(Build.ArtifactStagingDirectory)/packages --configuration ${{ parameters.configuration }}
19+
arguments: >
20+
--configuration ${{ parameters.configuration }}
21+
--no-build
22+
--no-restore
23+
--output $(Build.ArtifactStagingDirectory)/packages

build/azure-pipelines-template/pack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
- Dibix.Testing
1818
configuration: ${{ parameters.configuration }}
1919

20-
- template: publish.yml
20+
- template: publish-artifact.yml
2121
parameters:
2222
artifact: NuGet packages
2323
folder: packages

build/azure-pipelines-template/publish.yml renamed to build/azure-pipelines-template/publish-artifact.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
steps:
88
- pwsh: New-Item -ItemType Directory -Force -Path $(Build.ArtifactStagingDirectory)/${{ parameters.folder }}
99
displayName: 👮 Ensure artifact folder '${{ parameters.folder }}' exists
10-
condition: succeededOrFailed()
1110

1211
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.folder }}
13-
condition: succeededOrFailed()
1412
displayName: 💾 Publish '${{ parameters.artifact }}' artifact
1513
artifact: ${{ parameters.artifact }}

build/azure-pipelines-template/publish-coverage.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ steps:
1212

1313
- task: DotNetCoreCLI@2
1414
displayName: 📈 Install ReportGenerator
15-
condition: succeededOrFailed()
1615
inputs:
1716
command: custom
1817
custom: tool
@@ -24,11 +23,9 @@ steps:
2423
-targetdir:"$(Pipeline.Workspace)/Test output (Windows)"
2524
-reporttypes:Cobertura
2625
displayName: 🔗 Merge code coverage results (*.xml)
27-
condition: succeededOrFailed()
2826

2927
- task: PublishCodeCoverageResults@1
3028
displayName: ☑️ Publish code coverage
31-
condition: succeededOrFailed()
3229
inputs:
3330
codeCoverageTool: Cobertura
3431
summaryFileLocation: $(Pipeline.Workspace)/Test output (Windows)/Cobertura.xml

build/azure-pipelines-template/test-dotnet-cobertura.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
- ${{ each project in parameters.projects }}:
1616
- task: DotNetCoreCLI@2
1717
displayName: 🧪 Test ${{ project }}
18-
condition: succeededOrFailed()
18+
continueOnError: true
1919
inputs:
2020
command: test
2121
projects: tests/${{ project }}
@@ -30,11 +30,9 @@ steps:
3030
3131
- pwsh: Get-ChildItem $(Agent.TempDirectory)/*/coverage.cobertura.xml | %{ Rename-Item -Path $_.FullName -NewName ${{ project }}.xml }
3232
displayName: 🎨 Rename coverage.cobertura.xml -> ${{ project }}.xml
33-
condition: succeededOrFailed()
3433

3534
- task: CopyFiles@2
3635
displayName: 🪂 Prepare test artifacts
37-
condition: succeededOrFailed()
3836
inputs:
3937
SourceFolder: $(Agent.TempDirectory)
4038
TargetFolder: $(Build.ArtifactStagingDirectory)/test

build/azure-pipelines-template/test-dotnet-native.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
- ${{ each project in parameters.projects }}:
1616
- task: DotNetCoreCLI@2
1717
displayName: 🧪 Test ${{ project }}
18-
condition: succeededOrFailed()
18+
continueOnError: true
1919
inputs:
2020
command: test
2121
projects: tests/${{ project }}
@@ -33,7 +33,6 @@ steps:
3333
3434
- task: PublishTestResults@2
3535
displayName: 📗 Publish test results
36-
condition: succeededOrFailed()
3736
inputs:
3837
testResultsFormat: VSTest
3938
testResultsFiles: $(Agent.TempDirectory)/${{ project }}.trx
@@ -45,11 +44,9 @@ steps:
4544

4645
- pwsh: Get-ChildItem $(Agent.TempDirectory)/*/*.coverage | %{ Rename-Item -Path $_.FullName -NewName ${{ project }}.coverage }
4746
displayName: 🎨 Rename *.coverage -> ${{ project }}.coverage
48-
condition: succeededOrFailed()
4947

5048
- task: CopyFiles@2
5149
displayName: 🪂 Prepare test artifacts
52-
condition: succeededOrFailed()
5350
inputs:
5451
SourceFolder: $(Agent.TempDirectory)
5552
TargetFolder: $(Build.ArtifactStagingDirectory)/test
@@ -58,14 +55,12 @@ steps:
5855

5956
- task: DeleteFiles@1
6057
displayName: 🧹 Cleanup previous coverage reports
61-
condition: succeededOrFailed()
6258
inputs:
6359
SourceFolder: $(Agent.TempDirectory)
6460
Contents: '*/${{ project }}.coverage'
6561

6662
- task: DotNetCoreCLI@2
6763
displayName: 📈 Install dotnet-coverage
68-
condition: succeededOrFailed()
6964
inputs:
7065
command: custom
7166
custom: tool
@@ -77,7 +72,6 @@ steps:
7772
--output $(Build.ArtifactStagingDirectory)/test/CodeCoverage.coverage
7873
$(Build.ArtifactStagingDirectory)/test/*.coverage
7974
displayName: 🔗 Merge code coverage results (*.coverage)
80-
condition: succeededOrFailed()
8175

8276
- script: >
8377
$(Agent.TempDirectory)/dotnet-coverage
@@ -86,4 +80,3 @@ steps:
8680
--output-format cobertura
8781
$(Build.ArtifactStagingDirectory)/test/CodeCoverage.coverage"
8882
displayName: 🔗 Merge code coverage results (*.xml)
89-
condition: succeededOrFailed()

build/azure-pipelines-template/test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
steps:
2020
- task: DotNetCoreCLI@2
2121
displayName: 📈 Install ReportGenerator
22-
condition: succeededOrFailed()
2322
inputs:
2423
command: custom
2524
custom: tool
@@ -70,9 +69,8 @@ steps:
7069
-targetdir:$(Build.ArtifactStagingDirectory)/test/Report
7170
-reporttypes:HtmlInline_AzurePipelines_Dark
7271
displayName: 🔗 Merge code coverage results (*.html)
73-
condition: succeededOrFailed()
7472

75-
- template: publish.yml
73+
- template: publish-artifact.yml
7674
parameters:
7775
artifact: Test output ($(operatingSystem))
7876
folder: test

0 commit comments

Comments
 (0)