Skip to content

[windows][build.ps1] only use swift-corelibs-foundation-windows checkout #75140

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.

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

Merged
merged 1 commit into from
Jul 11, 2024
Merged
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion utils/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -1668,8 +1668,15 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
}

$env:CTEST_OUTPUT_ON_FAILURE = 1
if ($env:CI) {
# Use the windows-specific checkout on CI that provides
# a checkout that does not yet use swift-foundation.
$RepoName = "swift-corelibs-foundation-windows";
} else {
$RepoName = "swift-corelibs-foundation";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does the script that specifies swift-corelibs-foundation for local builds live? Is it currently checking out main or windows/main?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is at https://github.com/compnerd/swift-build/blob/main/default.xml#L20. It should checkout windows/main for now and will need to be changed back to main once main restores the ability to build for Windows.

}
Build-CMakeProject `
-Src $SourceCache\swift-corelibs-foundation-windows `
-Src $SourceCache\$RepoName `
-Bin $FoundationBinaryCache `
-InstallTo $InstallPath `
-Arch $Arch `
Expand Down