Skip to content

Commit

Permalink
Merge pull request #5 from tidusjar/feature/v4
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
vsc55 authored Nov 27, 2020
2 parents ccbf67d + fc94f56 commit 10e3515
Show file tree
Hide file tree
Showing 624 changed files with 36,682 additions and 21,968 deletions.
93 changes: 93 additions & 0 deletions .azuredevops/pipelines/publish-job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@

variables:
- template: templates/variables.yml

stages:
- stage: build
jobs:
- job: Build
pool:
vmImage: ${{ variables.vmImage }}
steps:
- template: templates/build-steps.yml

- stage: publish
jobs:
- job:
strategy:
matrix:
win10-x64:
runtime: win10-x64
format: zip
compression: zip
win10-x86:
runtime: win10-x86
format: zip
compression: zip
osx-x64:
runtime: osx-x64
format: tar.gz
compression: tar
linux-x64:
runtime: linux-x64
format: tar.gz
compression: tar
linux-arm:
runtime: linux-arm
format: tar.gz
compression: tar
linux-arm64:
runtime: linux-arm64
format: tar.gz
compression: tar
pool:
vmImage: ${{ variables.vmImage }}
steps:
- template: templates/publish-os-steps.yml

- stage: deploy
jobs:
- job:
condition: and(succeeded(), eq(variables.isMain, true))
steps:
- task: DownloadPipelineArtifact@2
inputs:
buildType: 'current'
targetPath: '$(System.ArtifactsDirectory)'

- task: PowerShell@2
displayName: 'Get Release Notes'
inputs:
targetType: 'inline'
script: |
$response = Invoke-WebRequest -Uri "https://ombireleasenote.azurewebsites.net/api/ReleaseNotesFunction?buildId=$(Build.BuildId)"
Write-Host "##vso[task.setvariable variable=ReleaseNotes;]$response"
# - task: GitHubRelease@1
# inputs:
# gitHubConnection: 'github.com_tidusjar'
# repositoryName: 'tidusjar/Ombi'
# action: 'create'
# target: '$(Build.SourceVersion)'
# tagSource: 'userSpecifiedTag'
# tag: '$(gitTag)'
# isDraft: true
# changeLogCompareToRelease: 'lastNonDraftRelease'
# changeLogType: 'commitBased'

- task: GitHubRelease@1
inputs:
gitHubConnection: 'github.com_tidusjar'
repositoryName: 'tidusjar/Ombi.Releases'
action: 'create'
target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672'
tagSource: 'userSpecifiedTag'
tag: '$(gitTag)'
releaseNotesSource: 'inline'
releaseNotesInline: '$(ReleaseNotes)'
assets: |
$(System.ArtifactsDirectory)/**/*.zip
$(System.ArtifactsDirectory)/**/*.tar.gz
isPreRelease: true
changeLogCompareToRelease: 'lastNonDraftRelease'
changeLogType: 'commitBased'
34 changes: 34 additions & 0 deletions .azuredevops/pipelines/templates/build-steps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
steps:
## This is needed due to https://github.com/microsoft/azure-pipelines-tasks/issues/8429
## For the set version tool...
- task: DotNetCoreInstaller@1
displayName: 'Use .NET Core sdk '
inputs:
packageType: 'sdk'
version: '5.x'

- task: Yarn@3
displayName: 'Install UI Dependancies'
inputs:
projectDirectory: '$(UiLocation)'
arguments: 'install'

- task: Yarn@3
displayName: 'Build and Publish Angular App'
inputs:
projectDirectory: '$(UiLocation)'
arguments: 'run build'

- task: PublishPipelineArtifact@1
inputs:
targetPath: '$(UiLocation)dist'
artifact: 'angular_dist'
publishLocation: 'pipeline'

- task: DotNetCoreCLI@2
displayName: Run Unit Tests
inputs:
command: 'custom'
projects: '$(TestProject)'
custom: 'test'
continueOnError: false
57 changes: 57 additions & 0 deletions .azuredevops/pipelines/templates/publish-os-steps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
steps:
- task: DotNetCoreInstaller@1
displayName: 'Use .NET Core sdk '
inputs:
packageType: 'sdk'
version: '5.x'

- task: DotNetCoreInstaller@1
displayName: 'Use .NET Core sdk for versioning'
inputs:
packageType: 'sdk'
version: '3.1.x'

- task: PowerShell@2
displayName: 'Set Version'
inputs:
targetType: 'inline'
script: |
dotnet tool install -g dotnet-setversion
setversion -r $(BuildVersion)
- task: DotNetCoreCLI@2
displayName: 'publish $(runtime)'
inputs:
command: 'publish'
publishWebProjects: true
arguments: '-c $(BuildConfiguration) -r "$(runtime)" -o $(Build.ArtifactStagingDirectory)/$(runtime) --self-contained true -p:PublishSingleFile=true'
zipAfterPublish: false
modifyOutputPath: false

- task: DownloadPipelineArtifact@2
inputs:
buildType: 'current'
artifactName: 'angular_dist'
targetPath: '$(Build.ArtifactStagingDirectory)/angular_dist'

- task: CopyFiles@2
displayName: 'Copy Angular App $(runtime)'
inputs:
SourceFolder: '$(Build.ArtifactStagingDirectory)/angular_dist'
Contents: '**'
TargetFolder: '$(Build.ArtifactStagingDirectory)/$(runtime)/ClientApp/dist'

- task: ArchiveFiles@2
displayName: 'Zip $(runtime)'
inputs:
rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/$(runtime)'
includeRootFolder: false
archiveType: $(compression)
archiveFile: '$(Build.ArtifactStagingDirectory)/$(runtime).$(format)'
replaceExistingArchive: true

- task: PublishPipelineArtifact@1
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)/$(runtime).$(format)'
artifact: '$(runtime)'
publishLocation: 'pipeline'
30 changes: 30 additions & 0 deletions .azuredevops/pipelines/templates/variables.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
variables:
- name: "BuildConfiguration"
value: "Release"

- name: "vmImage"
value: "ubuntu-latest"

- name: "Solution"
value: "**/*.sln"

- name: "TestProject"
value: "**/*.Tests.csproj"

- name: "NetCoreVersion"
value: "5.0"

- name: "PublishLocation"
value: "$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp$(NetCoreVersion)"

- name: "GitTag"
value: "v$(buildVersion)"

- name: "UiLocation"
value: "$(Build.SourcesDirectory)/src/Ombi/ClientApp/"

- name: "BuildVersion"
value: "4.0.$(Build.BuildId)"

- name: isMain
value: $[eq(variables['Build.SourceBranch'], 'refs/heads/feature/v4')]
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
---
name: Bug report
name: "\U0001F41B Bug report"
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

Expand Down Expand Up @@ -32,6 +29,7 @@ If applicable, a snippet of the logs that seems relevant to the bug if present.
**Ombi Version (please complete the following information):**
- Version [e.g. 3.0.1158]
- Media Server [e.g. Plex]
- Database Type: SQLite (Please change if using MySQL)

**Additional context**
Add any other context about the problem here.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Wiki
url: https://github.com/tidusjar/Ombi/wiki
about: The Ombi wiki should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
- name: Reddit support
url: https://www.reddit.com/r/Ombi
about: Ask questions about Ombi
- name: Feature suggestions
url: https://ombifeatures.featureupvote.com
about: Share your suggestions or ideas to make Ombi better!
18 changes: 0 additions & 18 deletions .github/workflows/aspnetcore.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .github/workflows/test.workflow

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,5 @@ _Pvt_Extensions
# Ignore local vscode config
*.vscode
/src/Ombi/database.json
/src/Ombi/healthchecksdb
/src/Ombi/ClientApp/package-lock.json
7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

12 changes: 0 additions & 12 deletions BuildTask.ps1

This file was deleted.

75 changes: 74 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,77 @@
# Changelog

## v3.0.4817 (2019-10-15)
## (unreleased)

### **New Features**

- Update login.component.ts. [Jamie]

- Update CHANGELOG.md. [Jamie]

- Updated SlackNotification.cs. [Tim]

### **Fixes**

- Fixed the issue where we couldn't always pick up stuff on the sync. [tidusjar]

- Removed hangfire completly from Ombi. [tidusjar]

- Fixed the notifications issue. [tidusjar]

- Fixed the issues where the DB was being disposed too early. [tidusjar]

- Fixed an error with the newsletter with the new db structure. [tidusjar]

- Output some useful stuff to the about window regarding the databases. [tidusjar]

- Fixed the migration for combined databases. [tidusjar]

- Fixed the issue where exisitng databases would now fail due to the DB structure changes. [tidusjar]

- Finished it! [tidusjar]

- Got MySql working. [tidusjar]

- Got the new DB structure in place. [tidusjar]

- Fix for #3219. [tidusjar]

- Fixed the error in the newsletter. [tidusjar]

- Fixed #3208. [tidusjar]

- Use tags and autocomplete for excluded keywords. [Taylor Buchanan]

- Add comments to clarify filter decisions. [Taylor Buchanan]

- Fix TS import order. [Taylor Buchanan]

- Add adult movie filtering. [Taylor Buchanan]

- Fix search bar overlap on mobile. [Taylor Buchanan]

- New translations en.json (Slovak) [Jamie]

- New translations en.json (Slovak) [Jamie]

- New translations en.json (Slovak) [Jamie]

- New translations en.json (Slovak) [Jamie]

- New translations en.json (Slovak) [Jamie]

- New translations en.json (Slovak) [Jamie]

- New translations en.json (Slovak) [Jamie]

- Add SK lang. [Jamie Rees]

- Add the migration to the correct database... #3214. [tidusjar]

- Hopefully provide a fix now for #2998 Theory is that the refresh metadata was using stale data and then overriding the availbility that just happened on that media item. [tidusjar]


## v3.0.4817 (2019-10-12)

### **New Features**

Expand Down Expand Up @@ -34,6 +105,8 @@

### **Fixes**

- Gitchangelog. [tidusjar]

- Fixed #3078. [tidusjar]

- Fixes issue #3195 The new string extension method ToHttpsUrl ensures that URLs starting with "https" are no longer turned into "httpss" The commit also replaces all occurances of the error prone .Replace("http", "https") in the whole solution. [msdeibel]
Expand Down
Loading

0 comments on commit 10e3515

Please sign in to comment.