Separate testing module and bzlmod tests for toolchains/posix #323
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
The previous test case was too lenient and would also succeed if the resolved toolchain was not provided by rules_nixpkgs but instead the default toolchain generated within a Nix shell.
Before common `.bazelrc` configuration was shared by making `.bazelrc` a symlink to a common configuration file. However, this approach had a few short-comings: 1) Any required modification meant that the symlink no longer worked and instead the file had to be replicated and adapted. Leading to duplicated code. 2) `%workspace%` relative paths had to be valid relative to all workspaces using the file. In this new setup common parts are factored out into `.bazelrc.common`, `.bazelrc.cc`, and `.bazelrc.java` in the top-level and can be imported into the workspace specific `.bazelrc` files as needed.
8 tasks
|
🎉 All dependencies have been resolved ! |
benradf
approved these changes
Feb 15, 2023
Comment on lines
+1
to
+3
| import %workspace%/.bazelrc.common | ||
| import %workspace%/.bazelrc.cc | ||
| import %workspace%/.bazelrc.java |
Comment on lines
+6
to
+11
| def _non_module_deps_impl(ctx): | ||
| nixpkgs_repositories(bzlmod = True) | ||
|
|
||
| non_module_deps = module_extension( | ||
| implementation = _non_module_deps_impl, | ||
| ) |
There was a problem hiding this comment.
I think this is implied by your TODO comment in testing/posix/MODULE.bazel, but is the idea to later remove this non_module_deps extension and directly call the various *_configure macros that nixpkgs_repositories currently invokes once they've been modularised?
There was a problem hiding this comment.
Yes, exactly, that's the plan once #183 is implemented (or as part of it).
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.
Depends on #320
Creates a new module in
testing/posixand moves the tests fromtoolchains/posixinto this module following the motivation from tweag/rules_sh#41.Makes the POSIX toolchain registration optional, as the corresponding
native.register_toolchainscannot be called in a repository macro under bzlmod.Refactors the
.bazelrcconfiguration to avoid duplication. See the corresponding commit message for details.