fix(Bazel): Fix local registry modules path #8805
Merged
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
clients/bazel-module-registry/src/main/kotlin/LocalBazelModuleRegistryService.kt
Fixed
Show fixed
Hide fixed
sschuberth
requested changes
Jun 27, 2024
| JSON.decodeFromStream<BazelRegistry>(it) | ||
| } | ||
|
|
||
| moduleDirectory = registryFile.resolve(bazelRegistry.moduleBasePath) | ||
| moduleDirectory = registryFile.parentFile.resolve(BAZEL_MODULES_DIR) |
There was a problem hiding this comment.
Use resolveSibling instead of parentFile.resolve.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #8805 +/- ##
============================================
- Coverage 67.79% 66.96% -0.84%
- Complexity 1164 1165 +1
============================================
Files 243 243
Lines 7711 7843 +132
Branches 861 914 +53
============================================
+ Hits 5228 5252 +24
- Misses 2127 2230 +103
- Partials 356 361 +5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Bazel modules are always in a 'modules' directory alongside the `bazel_registry.json` file. See [1]. The latter is still parsed and will be used in a future commit to handle modules with type 'local_path'. This is a fixup for 5968180. [1]: https://bazel.build/external/registry#index_registry Signed-off-by: Nicolas Nobelis <[email protected]>
nnobelis
force-pushed
the
nnobelis/fix_bazel_local_path
branch
from
2f047c4 to
dcb5541
Compare
sschuberth
approved these changes
Jun 27, 2024
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.
Bazel modules are always in a 'modules' directory alongside the
bazel_registry.jsonfile. See 1.The latter is still parsed and will be used in a future commit to handle modules with type 'local_path'.
This is a fixup for 5968180.