2
0
Эх сурвалжийг харах

Merge pull request #3863 from jellyfin/EraYaN-artifacts-nohup

Add nohup and continueOnError to the Collect Artifacts task
Joshua M. Boniface 4 жил өмнө
parent
commit
dcef8636d5

+ 0 - 3
.ci/azure-pipelines-abi.yml

@@ -62,7 +62,6 @@ jobs:
 
 
       - task: DownloadPipelineArtifact@2
       - task: DownloadPipelineArtifact@2
         displayName: 'Download Reference Assembly Build Artifact'
         displayName: 'Download Reference Assembly Build Artifact'
-        enabled: false
         inputs:
         inputs:
           source: "specific"
           source: "specific"
           artifact: "$(NugetPackageName)"
           artifact: "$(NugetPackageName)"
@@ -74,7 +73,6 @@ jobs:
 
 
       - task: CopyFiles@2
       - task: CopyFiles@2
         displayName: 'Copy Reference Assembly Build Artifact'
         displayName: 'Copy Reference Assembly Build Artifact'
-        enabled: false
         inputs:
         inputs:
           sourceFolder: $(System.ArtifactsDirectory)/current-artifacts
           sourceFolder: $(System.ArtifactsDirectory)/current-artifacts
           contents: '**/*.dll'
           contents: '**/*.dll'
@@ -85,7 +83,6 @@ jobs:
 
 
       - task: DotNetCoreCLI@2
       - task: DotNetCoreCLI@2
         displayName: 'Execute ABI Compatibility Check Tool'
         displayName: 'Execute ABI Compatibility Check Tool'
-        enabled: false
         inputs:
         inputs:
           command: custom
           command: custom
           custom: compat
           custom: compat

+ 7 - 4
.ci/azure-pipelines-package.yml

@@ -116,8 +116,9 @@ jobs:
         $(JellyfinVersion)-$(BuildConfiguration)
         $(JellyfinVersion)-$(BuildConfiguration)
 
 
 - job: CollectArtifacts
 - job: CollectArtifacts
-  timeoutInMinutes: 10
+  timeoutInMinutes: 20
   displayName: 'Collect Artifacts'
   displayName: 'Collect Artifacts'
+  continueOnError: true
   dependsOn:
   dependsOn:
   - BuildPackage
   - BuildPackage
   - BuildDocker
   - BuildDocker
@@ -129,19 +130,21 @@ jobs:
   steps:
   steps:
   - task: SSH@0
   - task: SSH@0
     displayName: 'Update Unstable Repository'
     displayName: 'Update Unstable Repository'
+    continueOnError: true
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
     inputs:
     inputs:
       sshEndpoint: repository
       sshEndpoint: repository
       runOptions: 'commands'
       runOptions: 'commands'
-      commands: sudo -n /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) unstable
+      commands: sudo nohup -n /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) unstable &
 
 
   - task: SSH@0
   - task: SSH@0
-    displayName: 'Update Stable Repository'
+    displayName: 'Update Stable Repository'    
+    continueOnError: true
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
     inputs:
     inputs:
       sshEndpoint: repository
       sshEndpoint: repository
       runOptions: 'commands'
       runOptions: 'commands'
-      commands: sudo -n /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber)
+      commands: sudo nohup -n /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) &
       
       
 - job: PublishNuget
 - job: PublishNuget
   displayName: 'Publish NuGet packages'
   displayName: 'Publish NuGet packages'