release/6.0 build changes cherry-picks #823
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove ICU from the checkout. This has been superseded by swift-foundation-icu. (cherry picked from commit 5183f32)
Add swift-toolchain-sqlite to the toolchain manifest. (cherry picked from commit 4dc9f92)
Enable the timestamp in the caches to make sure that the correct cache is restored. This should hopefully help increase the cache hit rate. (cherry picked from commit aada331)
Update the organisation for the repositories which have migrated from apple to swiftlang. (cherry picked from commit 73d1501)
Update to use the new sqlite mirror for the swift toolchain. This ensures that we keep in sync with the official toolchain builds. (cherry picked from commit e626872)
Remove the ICU dependency as it has been removed from the repo manifest. This now requires that we use the re-cored Foundation. (cherry picked from commit a513566)
(cherry picked from commit 9f72dc7)
The pin will no longer be needed since we're switching to swift-foundation (cherry picked from commit b49b337)
…ch version (cherry picked from commit ea62eb9)
CURL was updated to 8.9.1 upstream. Update the build rules to reflect that. (cherry picked from commit 1b5a7bb)
Split out the standard library build phase to allow us to build the macros for the correct hosts. This is required to allow us to build the macros for distribution and for the build of the SDK. Co-authored-by: Alex Lorenz <[email protected]> (cherry picked from commit 1093ac8)
These are not consumed by any other step. (cherry picked from commit 1177dfa)
Introduce a new macros build phase for the Foundation (and eventually Testing) macros. This depends on the previously introduced stdlib phase as the macros use the standard library. We build the macros for the compiler hosts, reusing them to build the SDK content. Wire this into the packaging step for the build tools as well. Co-authored-by: Alex Lorenz <[email protected]> (cherry picked from commit 400fce1)
`windows_build_runner` is too Windows-specific. This renames the variable to `default_build_runner`, to make space for future Darwin builds. The variable is kept to its original name in the `context` step, since this step will eventually also output Darwin variables. (cherry picked from commit e0239e1)
This is a preliminary step to eventually add the Mac build. The Mac build will be using a separate job with its own matrix. Co-authored-by: Saleem Abdulrasool <[email protected]> (cherry picked from commit 0cc87ce)
Now that the just built clang should no longer perform HCS on scoped EH functions, we should be able to enable this optimization globally. (cherry picked from commit d558028)
(cherry picked from commit a75c14e)
Clean up the job names to be consistent throughout. (cherry picked from commit ecbfb22)
Adjust the paths for the SDK phase, unify the swift-corelibs-foundation checkout. Co-authored-by: Alex Lorenz <[email protected]> (cherry picked from commit 876ec4a)
Update the repositories which have migrated to the swiftlang organisation. (cherry picked from commit 2395959)
This was broken in compnerd#796 (cherry picked from commit 8c02c26)
We now need to download the standard library and the SDK to get the same content that we used to previously have in just the SDK. Adjust that accordingly. (cherry picked from commit b91b97e)
We are already building the Foundation macros but did not pass that along to the Foundation build. This is now required and failure to pass it along results in a build failure. Wire it up so that we can build and avoid another build of the macros. (cherry picked from commit 0463388)
Introduce a build of swift-testing in the SDK as that is now distributed as part of the SDKs upstream. This allows us to have parity with the official builds. (cherry picked from commit 034d28f)
Depending on the runner configuration, `github.workspace` might be set up differently, resulting in issues when restoring previous builds from sccache. In order to work around this issue, this adds a hash of `github.workspace` to the sccache key to uniquely identify the build between different runner types. (cherry picked from commit 0579aa8)
This was removed in compnerd#801 to bring the file in line with downstream. However, it is better to rely on the vars environment when invoking the main workflow from dispatch, while offering an override when invoking the workflow as a sub-workflow. (cherry picked from commit 67bb06c)
The plugin name is `TestingMacros.dll` not `SwiftTesting.dll`. Correct the spelling for the build. (cherry picked from commit 4ca63bb)
Add missing flags for swift-testing configuration. This is primarily the C++ compiler, target triple, and the install location. (cherry picked from commit 9210338)
This is no longer needed as we pre-build the macros and no longer need to match up the swift-syntax build from the toolchain. (cherry picked from commit e6a8682)
Pull the future main branch for Android fixes. (cherry picked from commit 8336d10)
Setup `SDKROOT` environment variable rather than inlining that at each site. This greatly simplifies the CMake invocation. Additionally, extract prebuilt content into `BinaryCache` rather than `BuildRoot` which allows us to easily isolate the built artifacts for upload. (cherry picked from commit 105a9e4)
workaround the issue with missing new swift driver when building swift testing for android by disabling CMP0157. (cherry picked from commit 0b18205)
Pull in the Android stdlib when building Android installer MSI. (cherry picked from commit 3f2b15d)
* build with explicit -sdk passed into Swift * The SDKROOT environment variable isn't enough when using the old driver * checkout latest swift testing * pass c++ flags and c++ compiler for the markdown build * download devtools host sdk after the target libs are setup correctly * fix cmark path * debugging tools: download stdlib as well (cherry picked from commit 6ba7e5f)
hjyamauchi
approved these changes
Aug 30, 2024
compnerd
approved these changes
Sep 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These cherry-pick the recent changes that are needed for macros, swift-testing and swift-foundation.
They still need some additional repo cherry-picks that I'm gathering, but at least they will setup the build pipeline correctly.