diff --git a/BuildTools/appveyor-ilspycmd-install.ps1 b/BuildTools/appveyor-ilspycmd-install.ps1 index 41691695a..0d549c7a7 100644 --- a/BuildTools/appveyor-ilspycmd-install.ps1 +++ b/BuildTools/appveyor-ilspycmd-install.ps1 @@ -3,6 +3,9 @@ $ErrorActionPreference = "Stop" $baseCommit = "e17b4bfedf4dc747b105396224cd726bdca500ad"; $baseCommitRev = 1; +# make sure this matches artifacts-only branches list in appveyor.yml! +$masterBranches = '^(master|release/.+)$'; + $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; $versionParts = @{}; @@ -18,10 +21,10 @@ if ($versionName -ne "null") { } else { $versionName = ""; } -if ($env:APPVEYOR_REPO_BRANCH -ne 'master') { - $branch = "-$env:APPVEYOR_REPO_BRANCH"; -} else { +if ($env:APPVEYOR_REPO_BRANCH -match $masterBranches) { $branch = ""; +} else { + $branch = "-$env:APPVEYOR_REPO_BRANCH"; } $revision = [Int32]::Parse((git rev-list --count "$baseCommit..HEAD")) + $baseCommitRev; diff --git a/BuildTools/appveyor-install.ps1 b/BuildTools/appveyor-install.ps1 index 0b922deb8..a69ff0732 100644 --- a/BuildTools/appveyor-install.ps1 +++ b/BuildTools/appveyor-install.ps1 @@ -3,8 +3,8 @@ $ErrorActionPreference = "Stop" $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463"; $baseCommitRev = 1; -# make sure this list matches artifacts-only branches list in appveyor.yml! -$masterBranches = @("master", "5.0.x"); +# make sure this matches artifacts-only branches list in appveyor.yml! +$masterBranches = '^(master|release/.+)$'; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; @@ -21,7 +21,7 @@ if ($versionName -ne "null") { } else { $versionName = ""; } -if ($masterBranches -contains $env:APPVEYOR_REPO_BRANCH) { +if ($env:APPVEYOR_REPO_BRANCH -match $masterBranches) { $branch = ""; } else { $branch = "-$env:APPVEYOR_REPO_BRANCH"; diff --git a/BuildTools/pipelines-install.ps1 b/BuildTools/pipelines-install.ps1 index 4e3dda35e..718e13f0e 100644 --- a/BuildTools/pipelines-install.ps1 +++ b/BuildTools/pipelines-install.ps1 @@ -3,8 +3,8 @@ $ErrorActionPreference = "Stop" $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463"; $baseCommitRev = 1; -# make sure this list matches artifacts-only branches list in azure-pipelines.yml! -$masterBranches = @("master", "5.0.x"); +# make sure this matches artifacts-only branches list in appveyor.yml! +$masterBranches = '^(master|release/.+)$'; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; @@ -21,7 +21,7 @@ if ($versionName -ne "null") { } else { $versionName = ""; } -if ($masterBranches -contains $env:BUILD_SOURCEBRANCHNAME) { +if ($env:BUILD_SOURCEBRANCHNAME -match $masterBranches) { $branch = ""; } else { $branch = "-$env:BUILD_SOURCEBRANCHNAME"; diff --git a/BuildTools/update-assemblyinfo.ps1 b/BuildTools/update-assemblyinfo.ps1 index dbfa5f911..f7fa079b1 100644 --- a/BuildTools/update-assemblyinfo.ps1 +++ b/BuildTools/update-assemblyinfo.ps1 @@ -3,8 +3,8 @@ $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463"; $baseCommitRev = 1; -# make sure this list matches artifacts-only branches list in appveyor.yml! -$masterBranches = @("master", "5.0.x"); +# make sure this matches artifacts-only branches list in appveyor.yml! +$masterBranches = '^(master|release/.+)$'; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; @@ -112,7 +112,7 @@ try { $branchName = gitBranch; $gitCommitHash = gitCommitHash; - if ($masterBranches -contains $branchName) { + if ($branchName -match $masterBranches) { $postfixBranchName = ""; } else { $postfixBranchName = "-$branchName"; diff --git a/appveyor.yml b/appveyor.yml index 7bc77bb58..8b9b0dd07 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ for: - branches: only: - master - - 5.0.x + - /release\/*/ artifacts: - path: ILSpy_binaries.zip name: ILSpy %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% binaries diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e45b45d2d..a17e464da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,10 +1,10 @@ trigger: - master -- 5.0.x +- release/* pr: - master -- 5.0.x +- release/* variables: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true