Skip to content

Use a preset for the build-script invocation used by run_sk_stress_test #809

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
May 8, 2023

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented May 5, 2023

Depends on swiftlang/swift#65706


The hard-coded build-script invocation is gross and also didn’t build the new driver, which lead to issues. Use a preset based on the source compat suite presets instead.

Effectively, this will add the following arguments to the build-script invocation. --llvm-install-components and --swift-install-components just show the components the newly added components.

--cross-compile-hosts=macosx-arm64
--install-llvm \
--install-swift-driver \
--llvm-install-components=clang;clang-resource-headers;compiler-rt;clang-features-file
--swift-driver \
--swift-install-components=back-deployment;libexec

…est`

The hard-coded `build-script` invocation is gross and also didn’t build the new driver, which lead to issues. Use a preset based on the source compat suite presets instead.

Effectively, this will add the following arguments to the `build-script` invocation. `--llvm-install-components` and `--swift-install-components` just show the components the newly added components.

```
--cross-compile-hosts=macosx-arm64
--install-llvm \
--install-swift-driver \
--llvm-install-components=clang;clang-resource-headers;compiler-rt;clang-features-file
--swift-driver \
--swift-install-components=back-deployment;libexec
```
@ahoppen ahoppen force-pushed the ahoppen/build-with-preset branch from 61efafa to 0c33e99 Compare May 5, 2023 20:24
]
if args.cmake_c_launcher:
build_command += ['--cmake-c-launcher={}'.format(args.cmake_c_launcher)]
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we remove these arguments from the argument parser block of code? I don't think they are used anywhere else (args.cmake_c_launcher, args.cmake_cxx_launcher)

Copy link
Member Author

Choose a reason for hiding this comment

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

The stress tester job is passing those, so if we remove them, the innovation would fail. We should remove it in a staged approach:

  1. Merge this PR so it’s not used anymore
  2. Change CI jobs to not pass cmake-c-launcher and cmake-cxx-launcher
  3. Remove cmake-c-launcher and cmake-cxx-launcher from run_sk_stress_test

@ahoppen ahoppen merged commit f38b746 into swiftlang:main May 8, 2023
@ahoppen ahoppen deleted the ahoppen/build-with-preset branch May 8, 2023 17:51
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