Skip to content

Commit d5ec528

Browse files
authored
Promote x64-windows-release out of community (#43555)
1 parent 43cd0c6 commit d5ec528

File tree

9 files changed

+444
-348
lines changed

9 files changed

+444
-348
lines changed

ports/qtwebengine/vcpkg.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
33
"name": "qtwebengine",
44
"version": "6.8.2",
5+
"port-version": 1,
56
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
67
"homepage": "https://www.qt.io/",
78
"license": null,
8-
"supports": "!static & !((x86 | arm) & windows)",
9+
"supports": "!static & ((!x86 & !arm & native) | !windows)",
910
"dependencies": [
1011
{
1112
"name": "ffmpeg",

scripts/azure-pipelines/azure-pipelines.yml

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ jobs:
2424
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
2525
tripletPattern: ${{ parameters.tripletPattern }}
2626

27+
- template: windows/azure-pipelines.yml
28+
parameters:
29+
jobName: x64_windows_release
30+
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
31+
tripletPattern: ${{ parameters.tripletPattern }}
32+
2733
- template: windows/azure-pipelines.yml
2834
parameters:
2935
jobName: x64_windows_static

scripts/azure-pipelines/test-modified-ports.ps1

+8-2
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@ if ($lastLastExitCode -ne 0)
128128
exit $lastLastExitCode
129129
}
130130

131+
if ($Triplet -eq 'x64-windows-release') {
132+
$tripletSwitch = "--host-triplet=$Triplet"
133+
} else {
134+
$tripletSwitch = "--triplet=$Triplet"
135+
}
136+
131137
$parentHashes = @()
132138
if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
133139
{
@@ -165,7 +171,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
165171
# but changes must trigger at least some testing.
166172
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake"
167173
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user"
168-
& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
174+
& "./vcpkg$executableExtension" ci $tripletSwitch --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
169175
$lastLastExitCode = $LASTEXITCODE
170176
if ($lastLastExitCode -ne 0)
171177
{
@@ -192,7 +198,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
192198
# but changes must trigger at least some testing.
193199
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake"
194200
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user"
195-
& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg
201+
& "./vcpkg$executableExtension" ci $tripletSwitch --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg
196202
$lastLastExitCode = $LASTEXITCODE
197203

198204
$failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0))

0 commit comments

Comments
 (0)