Skip to content
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

Promote x64-windows-release out of community #43555

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
+452 −355
Draft

Promote x64-windows-release out of community #43555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e10fef
Promote x64-windows-release out of community as requested/sponsored b…
BillyONeal Jan 30, 2025
d58bf6a
Typos
BillyONeal Jan 30, 2025
684021e
Skip the dbghelps that don't work.
BillyONeal Jan 30, 2025
95962b3
Remove wrong openblas line.
BillyONeal Feb 7, 2025
9079ab5
Revert dbghelp changes entirely.
BillyONeal Feb 7, 2025
fc778a3
Skip x64-windows-release dbghelp and sort.
BillyONeal Feb 7, 2025
9ae7fbe
Actually fix the triplet switch handling.
BillyONeal Feb 7, 2025
0eba978
Mark qtwebengine as requiring 'native'
BillyONeal Feb 7, 2025
1d9ffd6
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Feb 7, 2025
fce7728
[cmake-user] Support single-config.
BillyONeal Feb 7, 2025
7f2dea9
Fix unit-test-cmake to support release-only.
BillyONeal Feb 7, 2025
9aa94ab
Curse sadly significant whitespace.
BillyONeal Feb 8, 2025
ae43118
Merge remote-tracking branch 'origin/master' into promote-release-only
BillyONeal Feb 8, 2025
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
3 changes: 2 additions & 1 deletion ports/qtwebengine/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version": "6.8.2",
"port-version": 1,
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
"homepage": "https://www.qt.io/",
"license": null,
"supports": "!static & !((x86 | arm) & windows)",
"supports": "!static & ((!x86 & !arm & native) | !windows)",
"dependencies": [
{
"name": "ffmpeg",
Expand Down
6 changes: 6 additions & 0 deletions scripts/azure-pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jobs:
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
tripletPattern: ${{ parameters.tripletPattern }}

- template: windows/azure-pipelines.yml
parameters:
jobName: x64_windows_release
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
tripletPattern: ${{ parameters.tripletPattern }}

- template: windows/azure-pipelines.yml
parameters:
jobName: x64_windows_static
Expand Down
10 changes: 8 additions & 2 deletions scripts/azure-pipelines/test-modified-ports.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ if ($lastLastExitCode -ne 0)
exit $lastLastExitCode
}

if ($Triplet -eq 'x64-windows-release') {
$tripletSwitch = "--host-triplet=$Triplet"
} else {
$tripletSwitch = "--triplet=$Triplet"
}

$parentHashes = @()
if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
{
Expand Down Expand Up @@ -165,7 +171,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
# but changes must trigger at least some testing.
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake"
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user"
& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
& "./vcpkg$executableExtension" ci $tripletSwitch --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
$lastLastExitCode = $LASTEXITCODE
if ($lastLastExitCode -ne 0)
{
Expand All @@ -192,7 +198,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
# but changes must trigger at least some testing.
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake"
Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user"
& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg
& "./vcpkg$executableExtension" ci $tripletSwitch --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg
$lastLastExitCode = $LASTEXITCODE

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