Skip to content

Commit eeca625

Browse files
authored
[FABCN-420] Remove Azure pipeline warnings (#177)
Used new coverage merge tool to joing coverage together Signed-off-by: Matthew B White <[email protected]>
1 parent cc7fee7 commit eeca625

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

ci/azure-pipelines.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ stages:
7373
set -ev
7474
node common/scripts/install-run-rush.js rebuild
7575
displayName: 'Full rebuild'
76-
76+
- script: |
77+
npx cobertura-merge -o merged_coverage.xml shimcrypto=./libraries/fabric-shim-crypto/coverage/cobertura-coverage.xml shim=./libraries/fabric-shim/coverage/cobertura-coverage.xml contractapi=./apis/fabric-contract-api/coverage/cobertura-coverage.xml -p
78+
condition: or(succeeded(), failed())
7779
- task: PublishTestResults@2
7880
condition: or(succeeded(), failed()) # publish either way
7981
inputs:
@@ -84,7 +86,7 @@ stages:
8486
condition: or(succeeded(), failed()) # publish either way
8587
inputs:
8688
codeCoverageTool: 'cobertura'
87-
summaryFileLocation: '**/cobertura-coverage.xml'
89+
summaryFileLocation: 'merged_coverage.xml'
8890
artifactName: 'Unit Test Coverage'
8991
- script: |
9092
mkdir -p $(Build.ArtifactStagingDirectory)/logs
@@ -102,7 +104,6 @@ stages:
102104
set -ev
103105
node common/scripts/install-run-rush.js publish --include-all --pack --release-folder $(Build.ArtifactStagingDirectory)/tgz --publish
104106
docker image save hyperledger/fabric-nodeenv | gzip > $(Build.ArtifactStagingDirectory)/fabric-nodeenv.tar.gz
105-
displayName: 'Package tgz and docker image'
106107
- task: PublishBuildArtifacts@1
107108
inputs:
108109
pathToPublish: $(Build.ArtifactStagingDirectory)/tgz
@@ -161,6 +162,7 @@ stages:
161162
- script: |
162163
mkdir -p $(Build.ArtifactStagingDirectory)/testlogs
163164
find . \( -type d -name 'node_modules' \) -prune -o -name '*.build*.log' -exec cp {} $(Build.ArtifactStagingDirectory)/testlogs \;
165+
condition: or(succeeded(), failed())
164166
displayName: 'Copy test logs'
165167
- task: PublishBuildArtifacts@1
166168
condition: or(succeeded(), failed()) # publish either way
@@ -174,6 +176,7 @@ stages:
174176
pathToPublish: tools/toolchain/network/docker-compose/logs/docker.log
175177
artifactName: nodeenv-docker-image
176178

179+
177180
# Job to handle the auditing of the code
178181
# NPM audit is run on a 'fake' installation of the libraries
179182
# Pulling in all the dependencies it will be able to run NPM AUDIT, and if that returns a

0 commit comments

Comments
 (0)