diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-07-29 21:12:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-29 21:12:06 -0700 |
| commit | d367c4c0b8ab65278f6e9e1b21641753a6273882 (patch) | |
| tree | 009e5615923f4d3aee40293189e9eb5df7ca4789 /scripts | |
| parent | b93fa7a1b44a9290b9bdbb8ee7419cbda6fc20fa (diff) | |
| download | vcpkg-d367c4c0b8ab65278f6e9e1b21641753a6273882.tar.gz vcpkg-d367c4c0b8ab65278f6e9e1b21641753a6273882.zip | |
[vcpkg] Improve format check failure message (#12460)
* [docs] Add format document
* improve the error message
* Check the error message
* Finish test
* restore file list
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 | 4 | ||||
| -rw-r--r-- | scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 b/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 index 7f300164f..2adeeae45 100644 --- a/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 +++ b/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 @@ -32,9 +32,9 @@ try $msg = @( "", "The formatting of the C++ files didn't match our expectation.", - "If your build fails here, you need to format the following files with:" + "See https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#vcpkg-internal-code for solution." ) - $msg += " $(& $clangFormat -version)" + $msg += "File list:" $msg += " $changedFiles" $msg += "" diff --git a/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 b/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 index e4f52ae7b..e6e29068f 100644 --- a/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 +++ b/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 @@ -38,9 +38,8 @@ if (-not $IgnoreErrors -and $null -ne $changedFiles) $msg = @( "", "The formatting of the manifest files didn't match our expectation.", - "If your build fails here, you need to run:" + "See https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#manifest for solution." ) - $msg += " vcpkg x-format-manifest --all" $msg += "" $msg += "vcpkg should produce the following diff:" |