Skip to content

Fix EngineServices version bump check #6939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2021
Merged

Fix EngineServices version bump check #6939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf2c73f
Fix EngineServices version bump check
ladipro Oct 12, 2021
c4ea4ee
Prepend remote reference if the branch is not local
ladipro Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,14 @@ function Check-EditedFiles() {

function Check-RequiredVersionBumps() {
# Log VSTS errors for missing required version bumps
if ($env:SYSTEM_PULLREQUEST_TARGETBRANCH) {
$targetBranch = $env:SYSTEM_PULLREQUEST_TARGETBRANCH
if ($targetBranch) {
# Prepend remote reference if the branch is not local
if (!$targetBranch.StartsWith("refs/head/")) {
$targetBranch = "refs/remotes/origin/" + $targetBranch
}
$versionLineChanged = $false
git --no-pager diff --unified --no-color --exit-code -w origin/$env:SYSTEM_PULLREQUEST_TARGETBRANCH HEAD src\Framework\EngineServices.cs `
git --no-pager diff --unified --no-color --exit-code -w $targetBranch HEAD src\Framework\EngineServices.cs `
| Select-String -Pattern "int Version =" | ForEach-Object -process { $versionLineChanged = $true }
if (($LASTEXITCODE -ne 0) -and (-not $versionLineChanged)) {
throw "##vso[task.logissue type=error] Detected changes in Framework\EngineServices.cs without a version bump. " +
Expand Down