Browse Source

run azure-pipelines/appveyor on all branches we treat as release branches: master and release/*

release/6.2
Siegfried Pammer 5 years ago
parent
commit
22b3838e72
  1. 9
      BuildTools/appveyor-ilspycmd-install.ps1
  2. 6
      BuildTools/appveyor-install.ps1
  3. 6
      BuildTools/pipelines-install.ps1
  4. 6
      BuildTools/update-assemblyinfo.ps1
  5. 2
      appveyor.yml
  6. 4
      azure-pipelines.yml

9
BuildTools/appveyor-ilspycmd-install.ps1

@ -3,6 +3,9 @@ $ErrorActionPreference = "Stop"
$baseCommit = "e17b4bfedf4dc747b105396224cd726bdca500ad"; $baseCommit = "e17b4bfedf4dc747b105396224cd726bdca500ad";
$baseCommitRev = 1; $baseCommitRev = 1;
# make sure this matches artifacts-only branches list in appveyor.yml!
$masterBranches = '^(master|release/.+)$';
$globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs";
$versionParts = @{}; $versionParts = @{};
@ -18,10 +21,10 @@ if ($versionName -ne "null") {
} else { } else {
$versionName = ""; $versionName = "";
} }
if ($env:APPVEYOR_REPO_BRANCH -ne 'master') { if ($env:APPVEYOR_REPO_BRANCH -match $masterBranches) {
$branch = "-$env:APPVEYOR_REPO_BRANCH";
} else {
$branch = ""; $branch = "";
} else {
$branch = "-$env:APPVEYOR_REPO_BRANCH";
} }
$revision = [Int32]::Parse((git rev-list --count "$baseCommit..HEAD")) + $baseCommitRev; $revision = [Int32]::Parse((git rev-list --count "$baseCommit..HEAD")) + $baseCommitRev;

6
BuildTools/appveyor-install.ps1

@ -3,8 +3,8 @@ $ErrorActionPreference = "Stop"
$baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463"; $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463";
$baseCommitRev = 1; $baseCommitRev = 1;
# make sure this list matches artifacts-only branches list in appveyor.yml! # make sure this matches artifacts-only branches list in appveyor.yml!
$masterBranches = @("master", "5.0.x"); $masterBranches = '^(master|release/.+)$';
$globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs";
@ -21,7 +21,7 @@ if ($versionName -ne "null") {
} else { } else {
$versionName = ""; $versionName = "";
} }
if ($masterBranches -contains $env:APPVEYOR_REPO_BRANCH) { if ($env:APPVEYOR_REPO_BRANCH -match $masterBranches) {
$branch = ""; $branch = "";
} else { } else {
$branch = "-$env:APPVEYOR_REPO_BRANCH"; $branch = "-$env:APPVEYOR_REPO_BRANCH";

6
BuildTools/pipelines-install.ps1

@ -3,8 +3,8 @@ $ErrorActionPreference = "Stop"
$baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463"; $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463";
$baseCommitRev = 1; $baseCommitRev = 1;
# make sure this list matches artifacts-only branches list in azure-pipelines.yml! # make sure this matches artifacts-only branches list in appveyor.yml!
$masterBranches = @("master", "5.0.x"); $masterBranches = '^(master|release/.+)$';
$globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs";
@ -21,7 +21,7 @@ if ($versionName -ne "null") {
} else { } else {
$versionName = ""; $versionName = "";
} }
if ($masterBranches -contains $env:BUILD_SOURCEBRANCHNAME) { if ($env:BUILD_SOURCEBRANCHNAME -match $masterBranches) {
$branch = ""; $branch = "";
} else { } else {
$branch = "-$env:BUILD_SOURCEBRANCHNAME"; $branch = "-$env:BUILD_SOURCEBRANCHNAME";

6
BuildTools/update-assemblyinfo.ps1

@ -3,8 +3,8 @@
$baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463"; $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463";
$baseCommitRev = 1; $baseCommitRev = 1;
# make sure this list matches artifacts-only branches list in appveyor.yml! # make sure this matches artifacts-only branches list in appveyor.yml!
$masterBranches = @("master", "5.0.x"); $masterBranches = '^(master|release/.+)$';
$globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs"; $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs";
@ -112,7 +112,7 @@ try {
$branchName = gitBranch; $branchName = gitBranch;
$gitCommitHash = gitCommitHash; $gitCommitHash = gitCommitHash;
if ($masterBranches -contains $branchName) { if ($branchName -match $masterBranches) {
$postfixBranchName = ""; $postfixBranchName = "";
} else { } else {
$postfixBranchName = "-$branchName"; $postfixBranchName = "-$branchName";

2
appveyor.yml

@ -45,7 +45,7 @@ for:
- branches: - branches:
only: only:
- master - master
- 5.0.x - /release\/*/
artifacts: artifacts:
- path: ILSpy_binaries.zip - path: ILSpy_binaries.zip
name: ILSpy %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% binaries name: ILSpy %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% binaries

4
azure-pipelines.yml

@ -1,10 +1,10 @@
trigger: trigger:
- master - master
- 5.0.x - release/*
pr: pr:
- master - master
- 5.0.x - release/*
variables: variables:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

Loading…
Cancel
Save