From ec963d869a2bf57edfcfef418e2bf8a1d679d8ca Mon Sep 17 00:00:00 2001 From: Jamie Date: Fri, 8 Oct 2021 20:23:37 +0100 Subject: [PATCH] fix(4153): :bug: fixed gravitar issues --- .azuredevops/pipelines/publish-job.yml | 118 ------------------ .../pipelines/templates/build-steps.yml | 34 ----- .../pipelines/templates/publish-os-steps.yml | 57 --------- .../pipelines/templates/variables.yml | 30 ----- 4 files changed, 239 deletions(-) delete mode 100644 .azuredevops/pipelines/publish-job.yml delete mode 100644 .azuredevops/pipelines/templates/build-steps.yml delete mode 100644 .azuredevops/pipelines/templates/publish-os-steps.yml delete mode 100644 .azuredevops/pipelines/templates/variables.yml diff --git a/.azuredevops/pipelines/publish-job.yml b/.azuredevops/pipelines/publish-job.yml deleted file mode 100644 index 435582858..000000000 --- a/.azuredevops/pipelines/publish-job.yml +++ /dev/null @@ -1,118 +0,0 @@ - -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 -# displayName: 'Ombi.Releases Release' -# inputs: -# gitHubConnection: 'PAT' -# repositoryName: 'Ombi-app/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' - -# - task: GitHubRelease@1 -# displayName: 'Ombi Release' -# inputs: -# gitHubConnection: 'PAT' -# repositoryName: 'Ombi-app/Ombi' -# action: 'create' -# target: '$(Build.SourceVersion)' -# tagSource: 'userSpecifiedTag' -# tag: '$(gitTag)' -# releaseNotesSource: 'inline' -# releaseNotesInline: '$(ReleaseNotes)' -# assets: | -# $(System.ArtifactsDirectory)/**/*.zip -# $(System.ArtifactsDirectory)/**/*.tar.gz -# isPreRelease: true -# changeLogCompareToRelease: 'lastNonDraftRelease' -# changeLogType: 'commitBased' - -# - task: PowerShell@2 -# displayName: "Trigger APT build" -# inputs: -# targetType: 'inline' -# script: | -# $body = @{ -# "ref"="main" -# "inputs"= @{"version"= "$(gitTag)"} -# } | ConvertTo-Json - -# $header = @{ -# "Accept"="application/vnd.github.v3+json" -# "Authorization"="Bearer $(APTPAT)" -# "User-Agent"="Ombi" -# } - -# Invoke-RestMethod -Uri "https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches" -Method 'Post' -Body $body -Headers $header \ No newline at end of file diff --git a/.azuredevops/pipelines/templates/build-steps.yml b/.azuredevops/pipelines/templates/build-steps.yml deleted file mode 100644 index 111424222..000000000 --- a/.azuredevops/pipelines/templates/build-steps.yml +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/.azuredevops/pipelines/templates/publish-os-steps.yml b/.azuredevops/pipelines/templates/publish-os-steps.yml deleted file mode 100644 index 2f63fa4a4..000000000 --- a/.azuredevops/pipelines/templates/publish-os-steps.yml +++ /dev/null @@ -1,57 +0,0 @@ -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' diff --git a/.azuredevops/pipelines/templates/variables.yml b/.azuredevops/pipelines/templates/variables.yml deleted file mode 100644 index e90ecc049..000000000 --- a/.azuredevops/pipelines/templates/variables.yml +++ /dev/null @@ -1,30 +0,0 @@ -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: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))]