[MM-19636] make file names consistent (#1186)

* added jq

* add verbose message

* add another option for getting the path of npm

* use package.json to get desktop version

* add componentdownload property as dinamic

* fix innertext

* add namespace to element

* remove v from version
This commit is contained in:
Guillermo Vayá
2020-02-11 11:06:43 +01:00
committed by GitHub
parent 3c35767df5
commit 217947b906
4 changed files with 41 additions and 27 deletions

View File

@@ -184,51 +184,47 @@ function Run-BuildId {
# candle.exe : error CNDL0001 : Value was either too large or too small for an Int32.
# Exception Type: System.OverflowException
# Add the revision only if we are not building a tag
Print-Info "Checking build id tag..."
if ($env:APPVEYOR_REPO_TAG -eq $true) {
$version = "$env:APPVEYOR_REPO_TAG_NAME"
} else {
$version = "$(git describe --tags $(git rev-list --tags --max-count=1))"
}
$version = "$(jq -r '.version' package.json)"
$winVersion = "$($version -Replace '-','.' -Replace '[^0-9.]')"
Print-Info "Checking build id tag validity... [$version]"
[version]$appVersion = New-Object -TypeName System.Version
[void][version]::TryParse($($version -Replace '-','.' -Replace '[^0-9.]'), [ref]$appVersion)
[void][version]::TryParse($winVersion, [ref]$appVersion)
if (!($appVersion)) {
Print-Error "Non parsable tag detected. Fallbacking to version 0.0.0."
$version = "0.0.0"
# if we couldn't parse, it might be a -develop or something similar, so we just add a
# number there that will change overtime. Most likely this is a PR to be tested
$revision = "$(git rev-list --all --count)"
$winVersion = "$($version -Replace '-.*').${revision}"
[void][version]::TryParse($winVersion, [ref]$appVersion)
if (!($appVersion)) {
Print-Error "Non parsable tag detected. Fallbacking to version 0.0.0."
$version = "0.0.0"
}
}
Print-Info -NoNewLine "Getting build id version..."
$env:COM_MATTERMOST_MAKEFILE_BUILD_ID = $version
$env:COM_MATTERMOST_MAKEFILE_BUILD_ID = "$version"
Print " [$env:COM_MATTERMOST_MAKEFILE_BUILD_ID]"
Print-Info -NoNewLine "Getting build id version for msi..."
$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_MSI = ($version -Replace '-','.' -Replace '[^0-9.]').Split('.')[0..3] -Join '.'
$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_MSI = $winVersion.Split('.')[0..3] -Join '.'
Print " [$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_MSI]"
Print-Info -NoNewLine "Getting build id version for node/npm..."
$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_NODE = ($version -Replace '^v').Split('.')[0..2] -Join '.'
$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_NODE = $version
Print " [$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_NODE]"
Print-Info "Patching version from msi xml descriptor..."
$msiDescriptorFileName = "scripts\msi_installer.wxs"
$msiDescriptor = [xml](Get-Content $msiDescriptorFileName)
$msiDescriptor.Wix.Product.Version = [string]$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_MSI
$ComponentDownload = $msiDescriptor.CreateElement("Property", "http://schemas.microsoft.com/wix/2006/wi")
$ComponentDownload.InnerText = "https://releases.mattermost.com/desktop/$version/mattermost-desktop-$version-`$(var.Platform).msi"
$ComponentDownload.SetAttribute("Id", "ComponentDownload")
$msiDescriptor.Wix.Product.AppendChild($ComponentDownload)
$msiDescriptor.Save($msiDescriptorFileName)
Print-Info "Patching version from electron package.json..."
$packageFileName = "package.json"
$package = Get-Content $packageFileName -Raw | ConvertFrom-Json
$package.version = [string]$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_NODE
$package | ConvertTo-Json | Set-Content $packageFileName
Print-Info "Patching version from electron src\package.json..."
$packageFileName = "src\package.json"
$package = Get-Content $packageFileName -Raw | ConvertFrom-Json
$package.version = [string]$env:COM_MATTERMOST_MAKEFILE_BUILD_ID_NODE
$package | ConvertTo-Json | Set-Content $packageFileName
Print-Info "Modified Wix XML"
}
function Run-BuildChangelog {