Skip to content

Update patches and build the compiler from the latest commits, not an older tag #9

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 4, 2025

Conversation

finagolfin
Copy link

Also, updated the C/C++ compilers used for Testing, as that was breaking the compiler-validated build.

Copy link

@bkhouri bkhouri left a comment

Choose a reason for hiding this comment

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

I'm not familiar with the swift-docker for Android pieces, but I has non-blocking suggestions.

./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-tag ${SWIFT_TAG}
else
if [[ "${BUILD_SCHEME}" == "development" ]]; then
Copy link

Choose a reason for hiding this comment

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

suggestion: instead of using environment variables, consider passing the --swift-scheme as a command line argument to the script. This way, this script won't needs to be maintains once the BUILD_SCHEME is not production as the onus is on the caller to provide the correct scheme.

e.g.: build-docker --scheme main or build-docker --scheme release/7.x

@@ -26,7 +26,15 @@ HOST_OS=ubuntu24.04
source ./scripts/toolchain-vars.sh

# Check-out and patch the sources
if [[ "${BUILD_COMPILER}" != "1" ]]; then
Copy link

Choose a reason for hiding this comment

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

suggestion (non-blocking): instead of relying on an environment variable, consider making this more discoverable to using a command line argument to this script.

e.g.: build-docker --build-compiler

@finagolfin
Copy link
Author

@bkhouri, thanks for your suggestions. These env vars are a temporary hack we used to pass these variables from a github workflow into this Docker run. Once we talk to Mishal about the interface he prefers for the official CI, which doesn't run on github Actions like this pull currently does, we will make similar changes to what you suggest, but according to his needs, and only then try to get this upstream. You can track our work at swiftlang#467 if you're interested. 😸

…r tags

Also update patches, particularly to disable failing tests from the compiler validation suite
@finagolfin finagolfin merged commit e2f696a into main Jul 4, 2025
1 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants