Simplify installer, try to fix name

This commit is contained in:
ta264 2019-08-11 13:35:34 +01:00
commit 67fb97db7b
2 changed files with 17 additions and 16 deletions

View file

@ -6,13 +6,15 @@
variables: variables:
artifactsFolder: './_artifacts' artifactsFolder: './_artifacts'
testsFolder: './_tests' testsFolder: './_tests'
majorVersion: '0.6.2'
minorVersion: $[counter(variables['build.reason'], 1000)] minorVersion: $[counter(variables['build.reason'], 1000)]
lidarrVersion: '0.6.2.$(minorVersion)' lidarrVersion: '$(majorVersion).$(minorVersion)'
windowsInstaller: 'Lidarr.$(Build.SourceBranchName).$(lidarrVersion).windows-installer.exe' buildName: '$(Build.SourceBranchName).$(lidarrVersion)'
windowsZip: 'Lidarr.$(Build.SourceBranchName).$(lidarrVersion).windows.zip' windowsInstaller: 'Lidarr.$(buildName).windows-installer.exe'
macOsApp: 'Lidarr.$(Build.SourceBranchName).$(lidarrVersion).osx-app.zip' windowsZip: 'Lidarr.$(buildName).windows.zip'
macOsTar: 'Lidarr.$(Build.SourceBranchName).$(lidarrVersion).osx.tar.gz' macOsApp: 'Lidarr.$(buildName).osx-app.zip'
linuxTar: 'Lidarr.$(Build.SourceBranchName).$(lidarrVersion).linux.tar.gz' macOsTar: 'Lidarr.$(buildName).osx.tar.gz'
linuxTar: 'Lidarr.$(buildName).linux.tar.gz'
sentryOrg: 'lidarr' sentryOrg: 'lidarr'
stages: stages:
@ -23,6 +25,8 @@ stages:
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
steps: steps:
# Set the build name properly. The 'name' property won't recursively expand so hack here:
- powershell: Write-Host "##vso[build.updatebuildnumber]$($env:BUILDNAME)"
- task: NodeTool@0 - task: NodeTool@0
inputs: inputs:
versionSpec: '10.x' versionSpec: '10.x'
@ -80,14 +84,11 @@ stages:
includeRootFolder: false includeRootFolder: false
rootFolderOrFile: $(artifactsFolder)/linux rootFolderOrFile: $(artifactsFolder)/linux
- bash: | - bash: |
export APPVEYOR_BUILD_NUMBER=${BUILD_BUILDID}
export APPVEYOR_BUILD_VERSION=${LIDARRVERSION}
export APPVEYOR_REPO_BRANCH=${BUILD_SOURCEBRANCHNAME}
./setup/inno/ISCC.exe "./setup/lidarr.iss" ./setup/inno/ISCC.exe "./setup/lidarr.iss"
cp ./setup/output/Lidarr.*windows.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/${WINDOWSINSTALLER} cp ./setup/output/Lidarr.*windows.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/${WINDOWSINSTALLER}
displayName: Create Windows installer displayName: Create Windows installer
- publish: $(Build.ArtifactStagingDirectory) - publish: $(Build.ArtifactStagingDirectory)
artifact: 'Lidarr' artifact: 'Packages'
- bash: | - bash: |
echo "Uploading source maps to sentry" echo "Uploading source maps to sentry"
yarn sentry-cli releases new --finalize -p lidarr -p lidarr-ui -p lidarr-update "${LIDARRVERSION}-debug" yarn sentry-cli releases new --finalize -p lidarr -p lidarr-ui -p lidarr-update "${LIDARRVERSION}-debug"
@ -182,7 +183,7 @@ stages:
displayName: Download Build Artifact displayName: Download Build Artifact
inputs: inputs:
buildType: 'current' buildType: 'current'
artifactName: Lidarr artifactName: Packages
itemPattern: '**/Lidarr.**.linux.tar.gz' itemPattern: '**/Lidarr.**.linux.tar.gz'
targetPath: $(Build.ArtifactStagingDirectory) targetPath: $(Build.ArtifactStagingDirectory)
- task: ExtractFiles@1 - task: ExtractFiles@1
@ -244,7 +245,7 @@ stages:
displayName: Download Build Artifact displayName: Download Build Artifact
inputs: inputs:
buildType: 'current' buildType: 'current'
artifactName: Lidarr artifactName: Packages
itemPattern: '**\Lidarr.**.windows.zip' itemPattern: '**\Lidarr.**.windows.zip'
targetPath: $(Build.ArtifactStagingDirectory) targetPath: $(Build.ArtifactStagingDirectory)
- task: ExtractFiles@1 - task: ExtractFiles@1
@ -341,4 +342,4 @@ stages:
displayName: Publish Coverage Results displayName: Publish Coverage Results
inputs: inputs:
codeCoverageTool: 'cobertura' codeCoverageTool: 'cobertura'
summaryFileLocation: '**/coverage.cobertura.xml' summaryFileLocation: '**/coverage.cobertura.xml'

View file

@ -7,9 +7,9 @@
#define ForumsURL "https://forums.lidarr.audio/" #define ForumsURL "https://forums.lidarr.audio/"
#define AppExeName "Lidarr.exe" #define AppExeName "Lidarr.exe"
#define BaseVersion "0.6.2" #define BaseVersion "0.6.2"
#define BuildNumber GetEnv('APPVEYOR_BUILD_NUMBER') #define BuildNumber GetEnv('MINORVERSION')
#define BuildVersion GetEnv('APPVEYOR_BUILD_VERSION') #define BuildVersion GetEnv('LIDARRVERSION')
#define BranchName GetEnv('APPVEYOR_REPO_BRANCH') #define BranchName GetEnv('BUILD_SOURCEBRANCHNAME')
[Setup] [Setup]
; NOTE: The value of AppId uniquely identifies this application. ; NOTE: The value of AppId uniquely identifies this application.