From 24a5bebabe1a615e724b60a8f708b1d9708b33c5 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Tue, 17 Sep 2019 01:33:17 +0200 Subject: [PATCH 1/3] Fix yaml parse error --- .ci/publish-nightly.yml | 4 +--- .ci/publish-release.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.ci/publish-nightly.yml b/.ci/publish-nightly.yml index 81c8de0fdb..efca970962 100644 --- a/.ci/publish-nightly.yml +++ b/.ci/publish-nightly.yml @@ -29,9 +29,7 @@ jobs: displayName: 'Create Drop directory' inputs: sshEndpoint: 'Jellyfin Build Server' - commands: | - mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer - ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_nightly_azure_upload + commands: 'mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer && ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_nightly_azure_upload' - task: CopyFilesOverSSH@0 displayName: 'Copy the Windows Setup to the Repo' diff --git a/.ci/publish-release.yml b/.ci/publish-release.yml index cd5abdb5f8..7b6a6aef01 100644 --- a/.ci/publish-release.yml +++ b/.ci/publish-release.yml @@ -31,9 +31,7 @@ jobs: displayName: 'Create Drop directory' inputs: sshEndpoint: 'Jellyfin Build Server' - commands: | - mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer - ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_nightly_azure_upload + commands: 'mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer && ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_nightly_azure_upload' - task: CopyFilesOverSSH@0 displayName: 'Copy the Windows Setup to the Repo' From 831ce4da137f2daef94f9646cd0ab3c505b209ce Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Tue, 17 Sep 2019 01:37:42 +0200 Subject: [PATCH 2/3] Skip checkout for Publish CI pipelines --- .ci/publish-nightly.yml | 2 +- .ci/publish-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/publish-nightly.yml b/.ci/publish-nightly.yml index efca970962..a693e10f6c 100644 --- a/.ci/publish-nightly.yml +++ b/.ci/publish-nightly.yml @@ -13,7 +13,7 @@ jobs: pool: vmImage: ubuntu-latest steps: - + - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download the Windows Setup Artifact inputs: diff --git a/.ci/publish-release.yml b/.ci/publish-release.yml index 7b6a6aef01..f618cdff0f 100644 --- a/.ci/publish-release.yml +++ b/.ci/publish-release.yml @@ -15,7 +15,7 @@ jobs: pool: vmImage: ubuntu-latest steps: - + - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download the Windows Setup Artifact inputs: From 6fa1c5e214203694f1ea42861a282617b31c39ff Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Tue, 17 Sep 2019 01:41:14 +0200 Subject: [PATCH 3/3] Fix release symlink name. --- .ci/publish-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/publish-release.yml b/.ci/publish-release.yml index f618cdff0f..57e77ae5aa 100644 --- a/.ci/publish-release.yml +++ b/.ci/publish-release.yml @@ -31,7 +31,7 @@ jobs: displayName: 'Create Drop directory' inputs: sshEndpoint: 'Jellyfin Build Server' - commands: 'mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer && ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_nightly_azure_upload' + commands: 'mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer && ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_release_azure_upload' - task: CopyFilesOverSSH@0 displayName: 'Copy the Windows Setup to the Repo' @@ -39,10 +39,10 @@ jobs: sshEndpoint: 'Jellyfin Build Server' sourceFolder: '$(System.ArtifactsDirectory)/win-installer' contents: 'jellyfin_*.exe' - targetFolder: '/srv/incoming/jellyfin_nightly_azure_upload/win-installer' + targetFolder: '/srv/incoming/jellyfin_release_azure_upload/win-installer' - task: SSH@0 displayName: 'Clean up SCP symlink' inputs: sshEndpoint: 'Jellyfin Build Server' - commands: 'rm -f /srv/incoming/jellyfin_nightly_azure_upload' + commands: 'rm -f /srv/incoming/jellyfin_release_azure_upload'