From bc02f4ef9271ea59390bab83f20ca32dbdae78ed Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Sun, 11 Aug 2019 17:04:58 +0100
Subject: [PATCH] Try to fix tests

---
 azure-pipelines.yml | 22 ++++++++++++----------
 build.sh            |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c173b90c3..486649b91 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -58,6 +58,16 @@ stages:
         displayName: Build Lidarr Backend
       - publish: $(outputFolder)
         artifact: '$(osName)Backend'
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - publish: $(testsFolder)
+        artifact: 'Tests'
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      # - task: PublishPipelineArtifact@0
+      #   displayName: Publish Tests Artifact
+      #   inputs:
+      #     artifactName: 'Tests' 
+      #     targetPath: '$(testsFolder)'
+
 
     - job: Frontend
       strategy:
@@ -84,7 +94,8 @@ stages:
         displayName: Build Lidarr Frontend
       - publish: $(outputFolder)
         artifact: '$(osName)Frontend'
-
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+        
     # - job: macOS
     #   displayName: macOS
     #   pool:
@@ -135,17 +146,8 @@ stages:
           buildType: 'current'
           artifactName: WindowsFrontend
           targetPath: _output
-      # - download: current
-      #   artifact: 'WindowsBackend'
-      # - download: current
-      #   artifact: 'WindowsFrontend'
       - bash: ./build.sh --only-packages
         displayName: Create Lidarr Packages
-      - task: PublishPipelineArtifact@0
-        displayName: Publish Tests Artifact
-        inputs:
-          artifactName: 'Tests' 
-          targetPath: '$(testsFolder)'
       - task: ArchiveFiles@2
         displayName: Create Windows zip
         inputs:
diff --git a/build.sh b/build.sh
index 5c5d8f7b5..16d3eb8e0 100755
--- a/build.sh
+++ b/build.sh
@@ -367,7 +367,8 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
 # Only build backend if we haven't set only-frontend or only-packages
 if [ -z "$ONLY_FRONTEND" ] && [ -z "$ONLY_PACKAGES" ];
 then
-   Build
+    Build
+    PackageTests
 fi
 
 # Only build frontend if we haven't set only-backend or only-packages
@@ -382,7 +383,6 @@ then
     PackageMono
     PackageMacOS
     PackageMacOSApp
-    PackageTests
     CleanupWindowsPackage
     PackageArtifacts
 fi