Skip to content

Commit 6fd40a0

Browse files
committed
Fix bad merge
1 parent b2d7c0d commit 6fd40a0

File tree

3 files changed

+4
-47
lines changed

3 files changed

+4
-47
lines changed

azure-pipelines/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@ jobs:
1919
- template: publish-symbols.yml
2020
- ${{ if parameters.RunTests }}:
2121
- template: publish-codecoverage.yml
22-
parameters:
23-
includeMacOS: ${{ parameters.includeMacOS }}
2422
- template: publish-deployables.yml

azure-pipelines/publish-codecoverage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
- powershell: azure-pipelines/Merge-CodeCoverage.ps1 -Path $PSScriptRoot\..\bin -OutputFile coveragereport/merged.cobertura.xml -Format Cobertura -Verbose
1+
steps:
2+
- powershell: azure-pipelines/Merge-CodeCoverage.ps1 -Path '$(Build.ArtifactStagingDirectory)\coverageResults-Linux' -OutputFile coveragereport/merged.cobertura.xml -Format Cobertura -Verbose
23
displayName: ⚙ Merge coverage
34
- task: PublishCodeCoverageResults@1
45
displayName: 📢 Publish code coverage results to Azure DevOps

azure-pipelines/publish-symbols.yml

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,16 @@
1-
parameters:
2-
includeMacOS:
3-
41
steps:
5-
- task: DownloadPipelineArtifact@2
6-
inputs:
7-
artifact: symbols-Windows
8-
path: $(Pipeline.Workspace)/symbols/Windows
9-
displayName: 🔻 Download Windows symbols
10-
continueOnError: true
11-
- task: DownloadPipelineArtifact@2
12-
inputs:
13-
artifact: symbols-Linux
14-
path: $(Pipeline.Workspace)/symbols/Linux
15-
displayName: 🔻 Download Linux symbols
16-
continueOnError: true
17-
- task: DownloadPipelineArtifact@2
18-
inputs:
19-
artifact: symbols-macOS
20-
path: $(Pipeline.Workspace)/symbols/macOS
21-
displayName: 🔻 Download macOS symbols
22-
continueOnError: true
23-
condition: ${{ parameters.includeMacOS }}
24-
25-
- task: DownloadPipelineArtifact@2
26-
inputs:
27-
artifact: test_symbols-Windows
28-
path: $(Pipeline.Workspace)/test_symbols/Windows
29-
displayName: 🔻 Download Windows test symbols
30-
continueOnError: true
31-
- task: DownloadPipelineArtifact@2
32-
inputs:
33-
artifact: test_symbols-Linux
34-
path: $(Pipeline.Workspace)/test_symbols/Linux
35-
displayName: 🔻 Download Linux test symbols
36-
continueOnError: true
37-
- task: DownloadPipelineArtifact@2
38-
inputs:
39-
artifact: test_symbols-macOS
40-
path: $(Pipeline.Workspace)/test_symbols/macOS
41-
displayName: 🔻 Download macOS test symbols
42-
continueOnError: true
43-
condition: ${{ parameters.includeMacOS }}
442

453
- task: PublishSymbols@2
464
inputs:
47-
SymbolsFolder: $(Pipeline.Workspace)/symbols
5+
SymbolsFolder: $(Build.ArtifactStagingDirectory)/symbols
486
SearchPattern: '**/*.pdb'
497
IndexSources: false
508
SymbolServerType: TeamServices
519
displayName: 📢 Publish symbols
5210

5311
- task: PublishSymbols@2
5412
inputs:
55-
SymbolsFolder: $(Pipeline.Workspace)/test_symbols
13+
SymbolsFolder: $(Build.ArtifactStagingDirectory)/test_symbols
5614
SearchPattern: '**/*.pdb'
5715
IndexSources: false
5816
SymbolServerType: TeamServices

0 commit comments

Comments
 (0)