use the full pipeline workspace from build job

This commit is contained in:
Qstick 2019-08-11 21:42:01 -04:00
commit bdd0cfe622
2 changed files with 9 additions and 12 deletions

View file

@ -67,6 +67,9 @@ stages:
- publish: $(outputFolder) - publish: $(outputFolder)
artifact: '$(osName)Backend' artifact: '$(osName)Backend'
condition: and(succeeded(), eq(variables['osName'], 'Windows')) condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- publish: $(Pipeline.Workspace)
artifact: 'CoverageBuild'
condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- publish: $(testsFolder) - publish: $(testsFolder)
artifact: 'Tests' artifact: 'Tests'
condition: and(succeeded(), eq(variables['osName'], 'Windows')) condition: and(succeeded(), eq(variables['osName'], 'Windows'))
@ -325,7 +328,6 @@ stages:
archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/Lidarr.**.windows.zip' archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/Lidarr.**.windows.zip'
destinationFolder: '$(Build.ArtifactStagingDirectory)/bin' destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
- bash: | - bash: |
ls -R ${BUILD_ARTIFACTSTAGINGDIRECTORY}
mkdir -p ./bin/ mkdir -p ./bin/
cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Lidarr/. ./bin/ cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Lidarr/. ./bin/
- task: Bash@3 - task: Bash@3
@ -397,21 +399,16 @@ stages:
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
steps: steps:
- checkout: self - checkout: none
submodules: true
#- bash: ./build.sh --only-backend #- bash: ./build.sh --only-backend
# displayName: Build Lidarr Backend # displayName: Build Lidarr Backend
- task: DownloadPipelineArtifact@2 - task: DownloadPipelineArtifact@2
inputs: inputs:
buildType: 'current' buildType: 'current'
artifactName: WindowsBackend artifactName: CoverageBuild
targetPath: _output targetPath: $(Pipeline.Workspace)
- task: DownloadPipelineArtifact@2 - bash: |
displayName: Download Test Artifact ls -R ./
inputs:
buildType: 'current'
artifactName: Tests
targetPath: _tests
#- publish: $(testsFolder) #- publish: $(testsFolder)
# artifact: 'CoverageTest' # artifact: 'CoverageTest'
- task: Bash@3 - task: Bash@3

View file

@ -59,7 +59,7 @@ if [ "$COVERAGE" = "Coverage" ]; then
if [ "$PLATFORM" = "Windows" ] ; then if [ "$PLATFORM" = "Windows" ] ; then
dotnet tool install coverlet.console --tool-path=./_tests/coverlet/ dotnet tool install coverlet.console --tool-path=./_tests/coverlet/
OPEN_COVER="./_tests/coverlet/coverlet" OPEN_COVER="./_tests/coverlet/coverlet"
$OPEN_COVER ./_tests/ --format "cobertura" --output "$COVERAGE_FILE" --exclude "[Lidarr.*.Test]*" --exclude "[Lidarr.Test.*]*" --exclude "[Marr.Data]*" --exclude "[MonoTorrent]*" --exclude "[CurlSharp]*" --target "$NUNIT" --targetargs "$NUNIT_PARAMS --where=\"$WHERE\" $ASSEMBLIES"; $OPEN_COVER ./_tests/ --verbosity "detailed" --format "cobertura" --output "$COVERAGE_FILE" --exclude "[Lidarr.*.Test]*" --exclude "[Lidarr.Test.*]*" --exclude "[Marr.Data]*" --exclude "[MonoTorrent]*" --exclude "[CurlSharp]*" --target "$NUNIT" --targetargs "$NUNIT_PARAMS --where=\"$WHERE\" $ASSEMBLIES";
EXIT_CODE=$? EXIT_CODE=$?
else else
echo "Coverage only supported on Windows" echo "Coverage only supported on Windows"