[Mac Build] Add stdlib build #843
Open
Conversation
This file contains 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
Collaborator
Steelskin
commented
Nov 7, 2024
•
Steelskin
commented
- Adapt stdlib job to build for both Windows and Mac.
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
6 times, most recently
from
e744c95 to
5a2d842
Compare
Steelskin
force-pushed
the
fabrice/mac-build-compilers
branch
4 times, most recently
from
f5f0bd7 to
cee6e49
Compare
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
from
5a2d842 to
6ea346c
Compare
Steelskin
force-pushed
the
fabrice/mac-build-compilers
branch
from
93fad08 to
d65f3fa
Compare
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
from
6ea346c to
fb11672
Compare
Steelskin
force-pushed
the
fabrice/mac-build-compilers
branch
2 times, most recently
from
34b2bed to
1d9ced6
Compare
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
4 times, most recently
from
425fe14 to
4643a5a
Compare
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
from
4643a5a to
fe272e4
Compare
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
from
fe272e4 to
718402d
Compare
compnerd
reviewed
Jan 14, 2025
| # TODO: Build this on macOS or make an equivalent Mac-only job | ||
| if: inputs.build_os == 'Windows' | ||
| needs: [compilers, cmark_gfm] | ||
| needs: [compilers] |
There was a problem hiding this comment.
Compilers will need the CMark GFM to execute, why is the dependency removed?
There was a problem hiding this comment.
I removed it because it is not a direct dependency of the stdlib job.
| - uses: actions/checkout@v4 | ||
| if: matrix.os == 'Darwin' | ||
| with: | ||
| path: ${{ github.workspace }}/SourceCache/swift-build |
There was a problem hiding this comment.
Can you use the explicit revision to checkout at?
There was a problem hiding this comment.
I intend to upstream the cache files before landing this and this will then go away.
| $StdlibCxx = "${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang++" | ||
| $StdlibFlags = "" | ||
| $StdlibCacheFile = "${{ github.workspace }}/SourceCache/swift-build/Runtime-${{ matrix.platform }}-${{ matrix.arch }}.cmake" | ||
| } |
There was a problem hiding this comment.
Can we push this down into the workflow through the matrix and simplify this somehow?
There was a problem hiding this comment.
I moved these to the matrices. It's a bit simpler now.
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
from
718402d to
fb2523c
Compare
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
2 times, most recently
from
22f85d3 to
71128d5
Compare
Steelskin
added a commit
that referenced
this pull request
Jan 30, 2025
In the stdlib job, the toolchain is now extracted under `BinaryCache/Library`, rather then under `BuildRoot/Library`. This allows to change the SDK artifact root path to `BuildRoot/Library`, simplifying download in subsequent jobs and making room for the macOS toolchain paths. Extracted from #843
Steelskin
added a commit
that referenced
this pull request
Jan 31, 2025
Currently, in the `stdlib` job, the toolchain is extracted to
`BuildRoot/Library`, and the Swift Standard Library is also installed to
`BuildRoot/Library`. Other jobs typically extract the toolchain to
`BinaryCache/Library`. This changes the extraction path to
`BinaryCache/Library` in the `stdlib` job, bringing it in-line with the
rest of the build.
In addition, this changes the Swift Standard Library artifact root to be
`BuildRoot/Library`, rather than the full path to the platform SDK,
`BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform`. This
is in preparation for adapting the job to build for macOS, where the
Swift Standard Library will be installed under
`Library/Toolchains/unknown-Asserts-development.xctoolchain/usr`.
Extracted from #843
* Add cache files for the stdlib build * Adapt stdlib job to build for both Windows and Mac.
Steelskin
force-pushed
the
fabrice/mac-build-stdlib
branch
from
71128d5 to
116e75d
Compare
compnerd
reviewed
Feb 6, 2025
Comment on lines
+471
to
+472
| "build_cc": "${HostToolchain}/usr/bin/clang-cl.exe", | ||
| "build_cxx": "${HostToolchain}/usr/bin/clang-cl.exe", |
There was a problem hiding this comment.
These are confusing. The build C/C++ compilers change between phases.
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.