Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Enforce formatting of baseline files. (#45282)

This commit is contained in:
Billy O'Neal 2025-04-30 11:56:46 -07:00 committed by GitHub
parent 4fb7d40480
commit 5a874b05fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/untrustedPR.yml vendored
View File

@ -41,6 +41,8 @@ jobs:
done || true; \
done > .github-pr.deprecated-license
./vcpkg format-manifest --all --convert-control
./vcpkg format-feature-baseline scripts/ci.baseline.txt
./vcpkg format-feature-baseline scripts/ci.feature.baseline.txt
git diff > .github-pr.format-manifest
git add -u
git commit -m "tmp" --allow-empty
@ -70,8 +72,10 @@ jobs:
let approve = true;
if (format !== "") {
var format_output = '';
format_output += "All vcpkg.json files must be formatted. To fix this problem, run:\n";
format_output += "All vcpkg.json files and baselines must be formatted. To fix this problem, run:\n";
format_output += "./vcpkg format-manifest ports/*/vcpkg.json\n";
format_output += "./vcpkg format-feature-baseline scripts/ci.baseline.txt\n";
format_output += "./vcpkg format-feature-baseline scripts/ci.feature.baseline.txt\n";
format_output += "\n";
format_output += "It should make the following changes:";
format_output += "```diff\n" + format + "\n```";

7
scripts/azure-pipelines/windows/azure-pipelines.yml
View File

@ -38,8 +38,11 @@ jobs:
- script: .\scripts\azure-pipelines\windows\bootstrap-from-source.cmd ${{ parameters.vcpkgToolSha }}
displayName: "Build vcpkg with CMake"
condition: ne('use default', '${{ parameters.vcpkgToolSha }}')
- script: '.\vcpkg.exe format-manifest --all'
displayName: 'Format Manifests'
- script: |
.\vcpkg.exe format-manifest --all
.\vcpkg.exe format-feature-baseline scripts\ci.baseline.txt
.\vcpkg.exe format-feature-baseline scripts\ci.feature.baseline.txt
displayName: 'Format Manifests and Baselines'
condition: eq('${{ replace(parameters.jobName, '_', '-') }}', '${{ variables.ExtraChecksTriplet }}')
- task: PowerShell@2
displayName: 'Create Diff'

8
scripts/ci.baseline.txt
View File

@ -663,14 +663,13 @@ minifb:x64-android=fail
miniply:arm-neon-android=fail
monkeys-audio:arm-neon-android=fail
monkeys-audio:arm64-android=fail
monkeys-audio:arm64-windows-static-md=fail
monkeys-audio:arm64-windows=fail
monkeys-audio:x64-android=fail
monkeys-audio:x64-windows-static=fail
moos-core:arm-neon-android=fail
moos-core:arm64-android=fail
moos-core:x64-android=fail
mpir:x64-android=fail
monkeys-audio:arm64-windows-static-md=fail
monkeys-audio:arm64-windows=fail
monkeys-audio:x64-windows-static=fail
moos-core:x64-windows-static=fail
moos-essential:arm64-windows-static-md=fail
moos-essential:arm64-windows=fail
@ -678,6 +677,7 @@ moos-essential:x64-windows-release=fail
moos-essential:x64-windows-static-md=fail
moos-essential:x64-windows=fail
moos-essential:x86-windows=fail
mpir:x64-android=fail
# ms-gdkx require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines
ms-gdkx:x64-windows-release=fail
ms-gdkx:x64-windows-static-md=fail

6
scripts/ci.feature.baseline.txt
View File

@ -54,9 +54,9 @@ llvm = skip
ace:x64-windows-static-md=fail
allegro5:arm64-windows=fail # Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy
apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
armadillo:arm-neon-android=cascade
armadillo:arm64-android=cascade
armadillo:x64-android=cascade
armadillo:arm-neon-android=cascade
bit7z(uwp)=cascade
blitz:arm-uwp=fail
blitz:arm64-windows=fail
@ -893,8 +893,8 @@ gdal[hdf5]:arm64-windows = cascade
gdcm2:arm64-uwp = cascade
gdcm2:arm64-windows = cascade
gdcm2:x64-uwp = cascade
gdk-pixbuf(uwp) = cascade
gdk-pixbuf[introspection](static | !(native | (windows & x86))) = cascade
gdk-pixbuf(uwp) = cascade
ginkgo[cuda]:arm64-uwp = cascade
ginkgo[cuda]:arm64-windows = cascade
ginkgo[cuda]:x64-uwp = cascade
@ -1523,8 +1523,8 @@ numcpp:x64-uwp = cascade
numcpp[python]:arm64-windows = cascade
nuspell:arm64-uwp = cascade
nuspell:x64-uwp = cascade
nvtt[cuda](osx) = cascade
nvtt[cuda]:x86-windows = cascade
nvtt[cuda](osx) = cascade
oatpp-mbedtls:arm64-uwp = cascade
oatpp-mbedtls:x64-uwp = cascade
oatpp-postgresql:arm64-uwp = cascade