Skip to content

[build-script-helper] Switch the --no-clean flag to --clean and have it actually do something #1558

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 23, 2024

Conversation

finagolfin
Copy link
Member

@finagolfin finagolfin commented Jul 8, 2024

Instead, swiftlang/swift#75053 makes sure build-script doesn't pass in the flag by
default, so you can explicitly invoke it only when needed.

This simply reverts 37d003e and renames the flag, so the flag can be invoked when needed and the build will be cleaned again.

@finagolfin finagolfin requested a review from ahoppen as a code owner July 8, 2024 11:51
@finagolfin
Copy link
Member Author

@artemcm, maybe you can review if Alex is busy or off this week?

…ave it actually do something

Instead, swiftlang/swift#75053 makes sure `build-script` doesn't pass in the flag by
default, so you can explicitly invoke it only when needed.
finagolfin added a commit to finagolfin/swift that referenced this pull request Jul 19, 2024
… the flag do nothing

Rather than make this change, swiftlang/sourcekit-lsp@37d003eb7 had the
`--no-clean` flag do nothing, which means the flag can't be used at all.
Instead, switch the flag to `--clean` in swiftlang/sourcekit-lsp#1558 and don't
invoke it by default.
@finagolfin finagolfin changed the title [build-script-helper] Have the --no-clean flag actually do something, ie clean by default [build-script-helper] Switch the --no-clean flag to --clean and have it actually do something Jul 19, 2024
@ahoppen
Copy link
Member

ahoppen commented Jul 22, 2024

@swift-ci Please test

@finagolfin
Copy link
Member Author

I think you'll need to run the CI here on the two pulls together, since we're changing the flag and the unmodified build-script passes in --no-clean. No need on the CI run for swiftlang/swift#75053 though, as it simply disables passing any flag to this repo.

@finagolfin
Copy link
Member Author

Yep, linux CI fails with

home/build-user/swift/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace --verbose --no-clean
usage: build-script-helper.py [-h] action ...
build-script-helper.py: error: unrecognized arguments: --no-clean

Both pulls need to be tested together here, but not there. Also, swiftlang/swift#75053 will need to be merged first.

@ahoppen
Copy link
Member

ahoppen commented Jul 22, 2024

I’ll just merge swiftlang/swift#75053 first and then this one.

@ahoppen
Copy link
Member

ahoppen commented Jul 23, 2024

@swift-ci Please test

@ahoppen ahoppen merged commit 65c1816 into swiftlang:main Jul 23, 2024
3 checks passed
@finagolfin
Copy link
Member Author

Thanks, Alex.

@finagolfin finagolfin deleted the clean branch July 23, 2024 10:19
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