From a6d80f557df8587c178c1a65722c1aa968a051e7 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Fri, 31 Jul 2020 21:40:09 +0200 Subject: [PATCH 1/3] Add a much shorter timeout to the CollectArtifacts job --- .ci/azure-pipelines-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml index 1677f71c75..10ce8508df 100644 --- a/.ci/azure-pipelines-package.yml +++ b/.ci/azure-pipelines-package.yml @@ -116,6 +116,7 @@ jobs: $(JellyfinVersion)-$(BuildConfiguration) - job: CollectArtifacts + timeoutInMinutes: 10 displayName: 'Collect Artifacts' dependsOn: - BuildPackage From 7c60510bc954c10792a10098f70c6db621a66188 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Sat, 1 Aug 2020 00:20:47 +0200 Subject: [PATCH 2/3] Experiment for the SSH task. --- .ci/azure-pipelines-package.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml index 10ce8508df..f64dc2ba98 100644 --- a/.ci/azure-pipelines-package.yml +++ b/.ci/azure-pipelines-package.yml @@ -132,11 +132,9 @@ jobs: condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master') inputs: sshEndpoint: repository - runOptions: 'inline' - inline: | - sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) unstable - rm $0 - exit + runOptions: 'commands' + commands: bash /srv/repository/collect-server.azure.sh + args: /srv/repository/incoming/azure $(Build.BuildNumber) unstable - task: SSH@0 displayName: 'Update Stable Repository' @@ -154,7 +152,7 @@ jobs: dependsOn: - BuildPackage condition: and(succeeded('BuildPackage'), startsWith(variables['Build.SourceBranch'], 'refs/tags')) - + pool: vmImage: 'ubuntu-latest' From 3ee28c016aa5e159c9b077a7d16a1e0fae7c2019 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Sat, 1 Aug 2020 00:32:25 +0200 Subject: [PATCH 3/3] Switch to sudo -n --- .ci/azure-pipelines-package.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml index f64dc2ba98..ab752d0d93 100644 --- a/.ci/azure-pipelines-package.yml +++ b/.ci/azure-pipelines-package.yml @@ -133,7 +133,7 @@ jobs: inputs: sshEndpoint: repository runOptions: 'commands' - commands: bash /srv/repository/collect-server.azure.sh + commands: sudo -n /srv/repository/collect-server.azure.sh args: /srv/repository/incoming/azure $(Build.BuildNumber) unstable - task: SSH@0 @@ -141,11 +141,9 @@ jobs: condition: startsWith(variables['Build.SourceBranch'], 'refs/tags') inputs: sshEndpoint: repository - runOptions: 'inline' - inline: | - sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) - rm $0 - exit + runOptions: 'commands' + commands: sudo -n /srv/repository/collect-server.azure.sh + args: /srv/repository/incoming/azure $(Build.BuildNumber) - job: PublishNuget displayName: 'Publish NuGet packages'