open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting and comment removal.

Browse Source
pull/2269/head
Erwin de Haan 5 years ago
parent da91b4fa4c
commit 67cae37308
5 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File

40
.ci/azure-pipelines-compat.yml
Unescape View File

@ -36,49 +36,49 @@ jobs:
- task: DownloadPipelineArtifact@2 - task: DownloadPipelineArtifact@2
displayName: "Download New Assembly Build Artifact" displayName: "Download New Assembly Build Artifact"
inputs: inputs:
source: "current" # Options: current, specific source: "current"
artifact: "$(NugetPackageName)" # Optional artifact: "$(NugetPackageName)"
path: "$(System.ArtifactsDirectory)/new-artifacts" path: "$(System.ArtifactsDirectory)/new-artifacts"
runVersion: "latest" # Required when source == Specific. Options: latest, latestFromBranch, specific runVersion: "latest"
- task: CopyFiles@2 - task: CopyFiles@2
displayName: "Copy New Assembly Build Artifact" displayName: "Copy New Assembly Build Artifact"
inputs: inputs:
sourceFolder: $(System.ArtifactsDirectory)/new-artifacts # Optional sourceFolder: $(System.ArtifactsDirectory)/new-artifacts
contents: "**/*.dll" contents: "**/*.dll"
targetFolder: $(System.ArtifactsDirectory)/new-release targetFolder: $(System.ArtifactsDirectory)/new-release
cleanTargetFolder: true # Optional cleanTargetFolder: true
overWrite: true # Optional overWrite: true
flattenFolders: true # Optional flattenFolders: true
- task: DownloadPipelineArtifact@2 - task: DownloadPipelineArtifact@2
displayName: "Download Reference Assembly Build Artifact" displayName: "Download Reference Assembly Build Artifact"
inputs: inputs:
source: "specific" # Options: current, specific source: "specific"
artifact: "$(NugetPackageName)" # Optional artifact: "$(NugetPackageName)"
path: "$(System.ArtifactsDirectory)/current-artifacts" path: "$(System.ArtifactsDirectory)/current-artifacts"
project: "$(System.TeamProjectId)" # Required when source == Specific project: "$(System.TeamProjectId)"
pipeline: "$(System.DefinitionId)" # Required when source == Specific pipeline: "$(System.DefinitionId)"
runVersion: "latestFromBranch" # Required when source == Specific. Options: latest, latestFromBranch, specific runVersion: "latestFromBranch"
runBranch: "refs/heads/$(System.PullRequest.TargetBranch)" # Required when source == Specific && runVersion == LatestFromBranch runBranch: "refs/heads/$(System.PullRequest.TargetBranch)"
- task: CopyFiles@2 - task: CopyFiles@2
displayName: "Copy Reference Assembly Build Artifact" displayName: "Copy Reference Assembly Build Artifact"
inputs: inputs:
sourceFolder: $(System.ArtifactsDirectory)/current-artifacts # Optional sourceFolder: $(System.ArtifactsDirectory)/current-artifacts
contents: "**/*.dll" contents: "**/*.dll"
targetFolder: $(System.ArtifactsDirectory)/current-release targetFolder: $(System.ArtifactsDirectory)/current-release
cleanTargetFolder: true # Optional cleanTargetFolder: true
overWrite: true # Optional overWrite: true
flattenFolders: true # Optional flattenFolders: true
- task: DownloadGitHubRelease@0 - task: DownloadGitHubRelease@0
displayName: "Download ABI Compatibility Check Tool" displayName: "Download ABI Compatibility Check Tool"
inputs: inputs:
connection: Jellyfin Release Download connection: Jellyfin Release Download
userRepository: EraYaN/dotnet-compatibility userRepository: EraYaN/dotnet-compatibility
defaultVersionType: "latest" # Options: latest, specificVersion, specificTag defaultVersionType: "latest"
itemPattern: "**-ci.zip" # Optional itemPattern: "**-ci.zip"
downloadPath: "$(System.ArtifactsDirectory)" downloadPath: "$(System.ArtifactsDirectory)"
- task: ExtractFiles@1 - task: ExtractFiles@1
@ -93,4 +93,4 @@ jobs:
displayName: "Execute ABI Compatibility Check Tool" displayName: "Execute ABI Compatibility Check Tool"
inputs: inputs:
script: "dotnet tools/CompatibilityCheckerCLI.dll current-release/$(AssemblyFileName) new-release/$(AssemblyFileName) --azure-pipelines --warnings-only" script: "dotnet tools/CompatibilityCheckerCLI.dll current-release/$(AssemblyFileName) new-release/$(AssemblyFileName) --azure-pipelines --warnings-only"
workingDirectory: $(System.ArtifactsDirectory) # Optional workingDirectory: $(System.ArtifactsDirectory)

8
.ci/azure-pipelines-main.yml
Unescape View File

@ -50,12 +50,12 @@ jobs:
displayName: "Copy Web Client" 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')) 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: inputs:
sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist # Optional sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist
contents: "**" contents: "**"
targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web
cleanTargetFolder: true # Optional cleanTargetFolder: true
overWrite: true # Optional overWrite: true
flattenFolders: false # Optional flattenFolders: false
- task: UseDotNet@2 - task: UseDotNet@2
displayName: "Update DotNet" displayName: "Update DotNet"

19
.ci/azure-pipelines-test.yml
Unescape View File

@ -40,29 +40,26 @@ jobs:
inputs: inputs:
command: "test" command: "test"
projects: ${{ parameters.TestProjects }} 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 publishTestResults: true
testRunTitle: $(Agent.JobName) testRunTitle: $(Agent.JobName)
workingDirectory: "$(Build.SourcesDirectory)" workingDirectory: "$(Build.SourcesDirectory)"
- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4 - 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 condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging
displayName: ReportGenerator (merge) displayName: ReportGenerator (merge)
inputs: inputs:
reports: '$(Agent.TempDirectory)/**/coverage.cobertura.xml' reports: "$(Agent.TempDirectory)/**/coverage.cobertura.xml"
targetdir: '$(Agent.TempDirectory)/merged/' targetdir: "$(Agent.TempDirectory)/merged/"
reporttypes: 'Cobertura' reporttypes: "Cobertura"
## V2 is already in the repository but it does not work "wrong number of segments" YAML error. ## V2 is already in the repository but it does not work "wrong number of segments" YAML error.
- task: PublishCodeCoverageResults@1 - task: PublishCodeCoverageResults@1
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging
displayName: Publish Code Coverage displayName: Publish Code Coverage
inputs: inputs:
codeCoverageTool: 'cobertura' codeCoverageTool: "cobertura"
#summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml' # !!THIS IS FOR V2 #summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml' # !!THIS IS FOR V2
summaryFileLocation: '$(Agent.TempDirectory)/merged/**.xml' summaryFileLocation: "$(Agent.TempDirectory)/merged/**.xml"
pathToSources: $(Build.SourcesDirectory) # Optional pathToSources: $(Build.SourcesDirectory)
#reportDirectory: # Optional failIfCoverageEmpty: true
#additionalCodeCoverageFiles: # Optional
failIfCoverageEmpty: true # Optional

24
.ci/azure-pipelines-windows.yml
Unescape View File

@ -43,12 +43,12 @@ jobs:
displayName: "Copy Web Client" 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')) 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: inputs:
sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist # Optional sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist
contents: "**" contents: "**"
targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web
cleanTargetFolder: true # Optional cleanTargetFolder: true
overWrite: true # Optional overWrite: true
flattenFolders: false # Optional flattenFolders: false
- task: CmdLine@2 - task: CmdLine@2
displayName: "Clone UX Repository" displayName: "Clone UX Repository"
@ -58,21 +58,21 @@ jobs:
- task: PowerShell@2 - task: PowerShell@2
displayName: "Build NSIS Installer" displayName: "Build NSIS Installer"
inputs: inputs:
targetType: "filePath" # Optional. Options: filePath, inline targetType: "filePath"
filePath: ./deployment/windows/build-jellyfin.ps1 # Required when targetType == FilePath filePath: ./deployment/windows/build-jellyfin.ps1
arguments: -InstallFFMPEG -InstallNSSM -MakeNSIS -InstallTrayApp -UXLocation $(Agent.TempDirectory)\jellyfin-ux -InstallLocation $(build.artifactstagingdirectory) arguments: -InstallFFMPEG -InstallNSSM -MakeNSIS -InstallTrayApp -UXLocation $(Agent.TempDirectory)\jellyfin-ux -InstallLocation $(build.artifactstagingdirectory)
errorActionPreference: "stop" # Optional. Options: stop, continue, silentlyContinue errorActionPreference: "stop"
workingDirectory: $(Build.SourcesDirectory) # Optional workingDirectory: $(Build.SourcesDirectory)
- task: CopyFiles@2 - task: CopyFiles@2
displayName: "Copy NSIS Installer" displayName: "Copy NSIS Installer"
inputs: inputs:
sourceFolder: $(Build.SourcesDirectory)/deployment/windows/ # Optional sourceFolder: $(Build.SourcesDirectory)/deployment/windows/
contents: "jellyfin*.exe" contents: "jellyfin*.exe"
targetFolder: $(System.ArtifactsDirectory)/setup targetFolder: $(System.ArtifactsDirectory)/setup
cleanTargetFolder: true # Optional cleanTargetFolder: true
overWrite: true # Optional overWrite: true
flattenFolders: true # Optional flattenFolders: true
- task: PublishPipelineArtifact@0 - task: PublishPipelineArtifact@0
displayName: "Publish Artifact Setup" displayName: "Publish Artifact Setup"

12
.ci/azure-pipelines.yml
Unescape View File

@ -17,19 +17,19 @@ trigger:
jobs: jobs:
- template: azure-pipelines-main.yml - template: azure-pipelines-main.yml
parameters: parameters:
LinuxImage: 'ubuntu-latest' LinuxImage: "ubuntu-latest"
RestoreBuildProjects: $(RestoreBuildProjects) RestoreBuildProjects: $(RestoreBuildProjects)
- template: azure-pipelines-test.yml - template: azure-pipelines-test.yml
parameters: parameters:
ImageNames: ImageNames:
Linux: 'ubuntu-latest' Linux: "ubuntu-latest"
Windows: 'windows-latest' Windows: "windows-latest"
macOS: 'macos-latest' macOS: "macos-latest"
- template: azure-pipelines-windows.yml - template: azure-pipelines-windows.yml
parameters: parameters:
WindowsImage: 'windows-latest' WindowsImage: "windows-latest"
TestProjects: $(TestProjects) TestProjects: $(TestProjects)
- template: azure-pipelines-compat.yml - template: azure-pipelines-compat.yml
@ -47,4 +47,4 @@ jobs:
Common: Common:
NugetPackageName: Jellyfin.Common NugetPackageName: Jellyfin.Common
AssemblyFileName: MediaBrowser.Common.dll AssemblyFileName: MediaBrowser.Common.dll
LinuxImage: 'ubuntu-latest' LinuxImage: "ubuntu-latest"

Write Preview
Loading…
Cancel
Save