Skip to content

Revert swift-corelibs-foundation-windows checkout #75255

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

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Revert swift-corelibs-foundation-windows checkout #75255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 8 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,15 +1669,8 @@ 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";
}
Build-CMakeProject `
-Src $SourceCache\$RepoName `
-Src $SourceCache\swift-corelibs-foundation `
-Bin $FoundationBinaryCache `
-InstallTo $InstallPath `
-Arch $Arch `
Expand Down
4 changes: 0 additions & 4 deletions utils/update_checkout/update-checkout-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
"remote": { "id": "apple/swift-corelibs-xctest" } },
"swift-corelibs-foundation": {
"remote": { "id": "apple/swift-corelibs-foundation" } },
"swift-corelibs-foundation-windows": {
"remote": { "id": "apple/swift-corelibs-foundation" } },
"swift-foundation-icu": {
"remote": { "id": "apple/swift-foundation-icu" } },
"swift-foundation": {
Expand Down Expand Up @@ -140,7 +138,6 @@
"swift-stress-tester": "main",
"swift-corelibs-xctest": "main",
"swift-corelibs-foundation": "main",
"swift-corelibs-foundation-windows": "windows/main",
"swift-foundation-icu": "main",
"swift-foundation": "main",
"swift-corelibs-libdispatch": "main",
Expand Down Expand Up @@ -192,7 +189,6 @@
"swift-stress-tester": "release/6.0",
"swift-corelibs-xctest": "release/6.0",
"swift-corelibs-foundation": "release/6.0",
"swift-corelibs-foundation-windows": "windows/release/6.0",
"swift-corelibs-libdispatch": "release/6.0",
"swift-integration-tests": "release/6.0",
"swift-xcode-playground-support": "release/6.0",
Expand Down