Fix Windows x86 CI #360
Merged
Fix Windows x86 CI #360
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
Previously, "windows-vs14 (x86)" was just doing an x64 build with the latest Visual Studio
graebm
commented
Mar 24, 2022
| # parse extra cmake configs | ||
| parser = argparse.ArgumentParser() | ||
| parser.add_argument('--cmake-extra', action='append', default=[]) | ||
| cmd_args = parser.parse_known_args(env.args.args)[0] |
.builder/actions/build_samples.py
Outdated
| @@ -28,6 +34,9 @@ def run(self, env): | |||
| f'-H{sample_path}', | |||
| f'-DCMAKE_PREFIX_PATH={env.install_dir}', | |||
| '-DCMAKE_BUILD_TYPE=RelWithDebInfo']) | |||
| # append extra cmake configs | |||
| for cmake_step in cmd_args.cmake_extra: | |||
| steps[-1].append(cmake_step) | |||
There was a problem hiding this comment.
style/trivial: python has the extend() method for gluing lists together. this could be like:
steps[-1].extend(cmd_args.cmake_extra)
xiazhvera
approved these changes
Mar 24, 2022
Closed
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.
Issue:
Previously, "windows-vs14 (x86)" was just doing an x64 build with the latest Visual Studio
Description of changes:
Now, the 14.0 toolset and Win32 (aka x86) architecture is actually used
Visual Studio 2015 isn't actually available on Github's Windows image but we can pass
-T v140and compile with the "toolset" from Visual Studio 2015.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.