mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 04:49:08 +08:00
36bd5e39b7
3 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Billy O'Neal
|
22b4033861
|
Update VMs for Patch Tuesday May 2022 (#24695)
* Install Ubuntu nasm package rather than building from source; 2.14 which is available in Ubuntu 20.04 is sufficient for intel-ipsec. * Add cmake and ninja. * Update CUDA signing key. * Update pwsh to 7.2.3 * Remove clean downloads step obsoleted since we ripped out pacman. * Note that haskell-stack is for bond. * Cherry pick from https://github.com/microsoft/vcpkg/pull/23569 : add cuda-nvml-dev-11-6 * Update pools. * Baseline updates PASSING, REMOVE FROM FAIL LIST: mesa:x64-windows-static-md (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). :) ``` REGRESSION: cppgraphqlgen:arm64-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:arm64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x64-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x64-windows-static failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x64-windows-static-md failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x86-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` This is a compiler behavior change or bug in VS 2022 16.2: ``` C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1432~1.313\bin\Hostx64\x86\cl.exe /TP -DGRAPHQL_DLLEXPORTS -DIMPL_GRAPHQLSERVICE_DLL -Dgraphqlservice_EXPORTS -ID:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\..\include -ID:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\..\PEGTL\include -external:ID:\installed\x86-windows\include -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 -MDd /W4 /WX /permissive- -std:c++20 /showIncludes /Fosrc\CMakeFiles\graphqlservice.dir\GraphQLService.cpp.obj /Fdsrc\CMakeFiles\graphqlservice.dir\ /FS -c D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\GraphQLService.cpp cl : Command line warning D9025 : overriding '/W3' with '/W4' D:\installed\x86-windows\include\tao\pegtl/demangle.hpp(147): error C2338: static_assert failed: 'internal::dependent_true< T > && ( begin != std::string_view::npos )' D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\include\graphqlservice/internal/SyntaxTree.h(120): note: see reference to function template instantiation 'std::string_view tao::graphqlpeg::demangle<graphql::peg::variable_value>(void) noexcept' being compiled D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\include\graphqlservice/internal/SyntaxTree.h(53): note: see reference to function template instantiation 'std::string_view graphql::peg::ast_node::type_name<graphql::peg::variable_value>(void) noexcept' being compiled D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\GraphQLService.cpp(310): note: see reference to function template instantiation 'bool graphql::peg::ast_node::is_type<graphql::peg::variable_value>(void) noexcept const' being compiled ninja: build stopped: subcommand failed. ``` This is a compiler behavior change in 17.2. @wravery do you have comments? ``` REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` qtwebengine doesn't report logs, but I'm pretty sure it's this ICE: https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296 @Neumann-A ``` REGRESSION: rsocket:x64-windows failed with BUILD_FAILED. If expected, add rsocket:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: rsocket:x64-windows-static failed with BUILD_FAILED. If expected, add rsocket:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: rsocket:x64-windows-static-md failed with BUILD_FAILED. If expected, add rsocket:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` ICE :( https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 Other changes: * Removed qt5-webengine skips because they are now skipped by a "supports" clause. * Removed ctp skips because asset caching exists. * [stxxl] Guard definition of log2 for current MSVCs. |
||
|
autoantwort
|
e7e328cf9d
|
[many ports] call vcpkg_fixup_pkgconfig() (#20953)
* [many ports] call vcpkg_fixup_pkgconfig() The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files * Update port-version for armadillo and polyclipping. * Update version database. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> |
||
|
Billy O'Neal
|
b295670e4b
|
Bulk convert control files. (#19986)
```
function Convert-Control {
Param($full)
.\vcpkg.exe format-manifest $full
$root = $full.Substring(0, $full.Length - 7) # CONTROL
$new = $root + 'vcpkg.json'
$content = Get-Content -Raw $new
$asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
$oldVersion = $asJson['port-version']
if ($null -eq $oldVersion) {
$oldVersionFull = $asJson['version-string']
Write-Host "Got version $oldVersionFull"
$match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
$newFullVersion = [string]$match.Groups[1].Value
$oldVersion = [int]$match.Groups[2].Value
Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
$newVersion = $oldVersion + 1
$asJson['version-string'] = $newFullVersion
Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
} else {
Write-Host "No previous version for $full -- setting 1"
$newVersion = 1
}
} else {
$newVersion = [int]$oldVersion + 1
Write-Host "New version for $full : $newVersion"
}
$asJson['port-version'] = $newVersion
$content = ConvertTo-Json $asJson -Depth 100
Set-Content -Path $new -Value $content
.\vcpkg.exe format-manifest $new
}
Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
Convert-Control $_.FullName
}
git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
|