aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin de Haan <EraYaN@users.noreply.github.com>2020-01-15 11:27:38 +0100
committerErwin de Haan <EraYaN@users.noreply.github.com>2020-01-15 11:39:47 +0100
commit67cae3730897318233179bd32945125d676e74a8 (patch)
treed59f89a88e651f95968ea559beb2e2e888d9ff76
parentda91b4fa4c10e6d2579291895bc32cd3a41f7bbd (diff)
Formatting and comment removal.
-rw-r--r--.ci/azure-pipelines-compat.yml44
-rw-r--r--.ci/azure-pipelines-main.yml10
-rw-r--r--.ci/azure-pipelines-test.yml21
-rw-r--r--.ci/azure-pipelines-windows.yml26
-rw-r--r--.ci/azure-pipelines.yml16
5 files changed, 57 insertions, 60 deletions
diff --git a/.ci/azure-pipelines-compat.yml b/.ci/azure-pipelines-compat.yml
index ac23e0b6d..6af956e1a 100644
--- a/.ci/azure-pipelines-compat.yml
+++ b/.ci/azure-pipelines-compat.yml
@@ -21,8 +21,8 @@ jobs:
${{ each Package in parameters.Packages }}:
${{ Package.key }}:
NugetPackageName: ${{ Package.value.NugetPackageName }}
- AssemblyFileName: ${{ Package.value.AssemblyFileName }}
- maxParallel: 2
+ AssemblyFileName: ${{ Package.value.AssemblyFileName }}
+ maxParallel: 2
dependsOn: MainBuild
steps:
- checkout: none
@@ -36,49 +36,49 @@ jobs:
- task: DownloadPipelineArtifact@2
displayName: "Download New Assembly Build Artifact"
inputs:
- source: "current" # Options: current, specific
- artifact: "$(NugetPackageName)" # Optional
+ source: "current"
+ artifact: "$(NugetPackageName)"
path: "$(System.ArtifactsDirectory)/new-artifacts"
- runVersion: "latest" # Required when source == Specific. Options: latest, latestFromBranch, specific
+ runVersion: "latest"
- task: CopyFiles@2
displayName: "Copy New Assembly Build Artifact"
inputs:
- sourceFolder: $(System.ArtifactsDirectory)/new-artifacts # Optional
+ sourceFolder: $(System.ArtifactsDirectory)/new-artifacts
contents: "**/*.dll"
targetFolder: $(System.ArtifactsDirectory)/new-release
- cleanTargetFolder: true # Optional
- overWrite: true # Optional
- flattenFolders: true # Optional
+ cleanTargetFolder: true
+ overWrite: true
+ flattenFolders: true
- task: DownloadPipelineArtifact@2
displayName: "Download Reference Assembly Build Artifact"
inputs:
- source: "specific" # Options: current, specific
- artifact: "$(NugetPackageName)" # Optional
+ source: "specific"
+ artifact: "$(NugetPackageName)"
path: "$(System.ArtifactsDirectory)/current-artifacts"
- project: "$(System.TeamProjectId)" # Required when source == Specific
- pipeline: "$(System.DefinitionId)" # Required when source == Specific
- runVersion: "latestFromBranch" # Required when source == Specific. Options: latest, latestFromBranch, specific
- runBranch: "refs/heads/$(System.PullRequest.TargetBranch)" # Required when source == Specific && runVersion == LatestFromBranch
+ project: "$(System.TeamProjectId)"
+ pipeline: "$(System.DefinitionId)"
+ runVersion: "latestFromBranch"
+ runBranch: "refs/heads/$(System.PullRequest.TargetBranch)"
- task: CopyFiles@2
displayName: "Copy Reference Assembly Build Artifact"
inputs:
- sourceFolder: $(System.ArtifactsDirectory)/current-artifacts # Optional
+ sourceFolder: $(System.ArtifactsDirectory)/current-artifacts
contents: "**/*.dll"
targetFolder: $(System.ArtifactsDirectory)/current-release
- cleanTargetFolder: true # Optional
- overWrite: true # Optional
- flattenFolders: true # Optional
+ cleanTargetFolder: true
+ overWrite: true
+ flattenFolders: true
- task: DownloadGitHubRelease@0
displayName: "Download ABI Compatibility Check Tool"
inputs:
connection: Jellyfin Release Download
userRepository: EraYaN/dotnet-compatibility
- defaultVersionType: "latest" # Options: latest, specificVersion, specificTag
- itemPattern: "**-ci.zip" # Optional
+ defaultVersionType: "latest"
+ itemPattern: "**-ci.zip"
downloadPath: "$(System.ArtifactsDirectory)"
- task: ExtractFiles@1
@@ -93,4 +93,4 @@ jobs:
displayName: "Execute ABI Compatibility Check Tool"
inputs:
script: "dotnet tools/CompatibilityCheckerCLI.dll current-release/$(AssemblyFileName) new-release/$(AssemblyFileName) --azure-pipelines --warnings-only"
- workingDirectory: $(System.ArtifactsDirectory) # Optional \ No newline at end of file
+ workingDirectory: $(System.ArtifactsDirectory)
diff --git a/.ci/azure-pipelines-main.yml b/.ci/azure-pipelines-main.yml
index fd263e20f..9880bbfaa 100644
--- a/.ci/azure-pipelines-main.yml
+++ b/.ci/azure-pipelines-main.yml
@@ -50,12 +50,12 @@ jobs:
displayName: "Copy Web Client"
condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
inputs:
- sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist # Optional
+ sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist
contents: "**"
targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web
- cleanTargetFolder: true # Optional
- overWrite: true # Optional
- flattenFolders: false # Optional
+ cleanTargetFolder: true
+ overWrite: true
+ flattenFolders: false
- task: UseDotNet@2
displayName: "Update DotNet"
@@ -98,4 +98,4 @@ jobs:
condition: and(eq(variables['BuildConfiguration'], 'Release'), succeeded())
inputs:
targetPath: "$(build.artifactstagingdirectory)/Jellyfin.Server/MediaBrowser.Common.dll"
- artifactName: "Jellyfin.Common" \ No newline at end of file
+ artifactName: "Jellyfin.Common"
diff --git a/.ci/azure-pipelines-test.yml b/.ci/azure-pipelines-test.yml
index eec02ff3b..4455632e1 100644
--- a/.ci/azure-pipelines-test.yml
+++ b/.ci/azure-pipelines-test.yml
@@ -1,7 +1,7 @@
parameters:
- name: ImageNames
type: object
- default:
+ default:
Linux: "ubuntu-latest"
Windows: "windows-latest"
macOS: "macos-latest"
@@ -40,29 +40,26 @@ jobs:
inputs:
command: "test"
projects: ${{ parameters.TestProjects }}
- arguments: "--configuration Release --collect:\"XPlat Code Coverage\" --settings tests/coverletArgs.runsettings --verbosity minimal \"-p:GenerateDocumentationFile=False\""
+ arguments: '--configuration Release --collect:"XPlat Code Coverage" --settings tests/coverletArgs.runsettings --verbosity minimal "-p:GenerateDocumentationFile=False"'
publishTestResults: true
testRunTitle: $(Agent.JobName)
workingDirectory: "$(Build.SourcesDirectory)"
-
- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging
displayName: ReportGenerator (merge)
inputs:
- reports: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
- targetdir: '$(Agent.TempDirectory)/merged/'
- reporttypes: 'Cobertura'
+ reports: "$(Agent.TempDirectory)/**/coverage.cobertura.xml"
+ targetdir: "$(Agent.TempDirectory)/merged/"
+ reporttypes: "Cobertura"
## V2 is already in the repository but it does not work "wrong number of segments" YAML error.
- task: PublishCodeCoverageResults@1
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging
displayName: Publish Code Coverage
inputs:
- codeCoverageTool: 'cobertura'
+ codeCoverageTool: "cobertura"
#summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml' # !!THIS IS FOR V2
- summaryFileLocation: '$(Agent.TempDirectory)/merged/**.xml'
- pathToSources: $(Build.SourcesDirectory) # Optional
- #reportDirectory: # Optional
- #additionalCodeCoverageFiles: # Optional
- failIfCoverageEmpty: true # Optional
+ summaryFileLocation: "$(Agent.TempDirectory)/merged/**.xml"
+ pathToSources: $(Build.SourcesDirectory)
+ failIfCoverageEmpty: true
diff --git a/.ci/azure-pipelines-windows.yml b/.ci/azure-pipelines-windows.yml
index c6ff3736a..32d1d1382 100644
--- a/.ci/azure-pipelines-windows.yml
+++ b/.ci/azure-pipelines-windows.yml
@@ -43,12 +43,12 @@ jobs:
displayName: "Copy Web Client"
condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
inputs:
- sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist # Optional
+ sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist
contents: "**"
targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web
- cleanTargetFolder: true # Optional
- overWrite: true # Optional
- flattenFolders: false # Optional
+ cleanTargetFolder: true
+ overWrite: true
+ flattenFolders: false
- task: CmdLine@2
displayName: "Clone UX Repository"
@@ -58,25 +58,25 @@ jobs:
- task: PowerShell@2
displayName: "Build NSIS Installer"
inputs:
- targetType: "filePath" # Optional. Options: filePath, inline
- filePath: ./deployment/windows/build-jellyfin.ps1 # Required when targetType == FilePath
+ targetType: "filePath"
+ filePath: ./deployment/windows/build-jellyfin.ps1
arguments: -InstallFFMPEG -InstallNSSM -MakeNSIS -InstallTrayApp -UXLocation $(Agent.TempDirectory)\jellyfin-ux -InstallLocation $(build.artifactstagingdirectory)
- errorActionPreference: "stop" # Optional. Options: stop, continue, silentlyContinue
- workingDirectory: $(Build.SourcesDirectory) # Optional
+ errorActionPreference: "stop"
+ workingDirectory: $(Build.SourcesDirectory)
- task: CopyFiles@2
displayName: "Copy NSIS Installer"
inputs:
- sourceFolder: $(Build.SourcesDirectory)/deployment/windows/ # Optional
+ sourceFolder: $(Build.SourcesDirectory)/deployment/windows/
contents: "jellyfin*.exe"
targetFolder: $(System.ArtifactsDirectory)/setup
- cleanTargetFolder: true # Optional
- overWrite: true # Optional
- flattenFolders: true # Optional
+ cleanTargetFolder: true
+ overWrite: true
+ flattenFolders: true
- task: PublishPipelineArtifact@0
displayName: "Publish Artifact Setup"
condition: succeeded()
inputs:
targetPath: "$(build.artifactstagingdirectory)/setup"
- artifactName: "Jellyfin Server Setup" \ No newline at end of file
+ artifactName: "Jellyfin Server Setup"
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index 221db162a..f79a85b21 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -17,24 +17,24 @@ trigger:
jobs:
- template: azure-pipelines-main.yml
parameters:
- LinuxImage: 'ubuntu-latest'
+ LinuxImage: "ubuntu-latest"
RestoreBuildProjects: $(RestoreBuildProjects)
- template: azure-pipelines-test.yml
parameters:
- ImageNames:
- Linux: 'ubuntu-latest'
- Windows: 'windows-latest'
- macOS: 'macos-latest'
+ ImageNames:
+ Linux: "ubuntu-latest"
+ Windows: "windows-latest"
+ macOS: "macos-latest"
- template: azure-pipelines-windows.yml
parameters:
- WindowsImage: 'windows-latest'
+ WindowsImage: "windows-latest"
TestProjects: $(TestProjects)
- template: azure-pipelines-compat.yml
parameters:
- Packages:
+ Packages:
Naming:
NugetPackageName: Jellyfin.Naming
AssemblyFileName: Emby.Naming.dll
@@ -47,4 +47,4 @@ jobs:
Common:
NugetPackageName: Jellyfin.Common
AssemblyFileName: MediaBrowser.Common.dll
- LinuxImage: 'ubuntu-latest' \ No newline at end of file
+ LinuxImage: "ubuntu-latest"