fix: locking with bzlmod #73
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
thesayyn
force-pushed
the
fix_locking
branch
2 times, most recently
from
9523dfe to
936aa5a
Compare
|
ping @alexeagle |
alexeagle
approved these changes
Aug 21, 2024
dragos250
reviewed
Sep 16, 2024
| wksp_file="WORKSPACE" | ||
| elif [ -e $BUILD_WORKSPACE_DIRECTORY/WORKSPACE.bazel ]; then | ||
| wksp_file="WORKSPACE.bazel" | ||
| else |
There was a problem hiding this comment.
I believe you should have checked MODULE.bazel too.
There was a problem hiding this comment.
I've added this in #88, hopefully it'll be merged soon :)
There was a problem hiding this comment.
Thanks for the quick turnaround, I really appreciate it!
jjmaestro
added a commit
to jjmaestro/rules_distroless
that referenced
this pull request
Sep 19, 2024
PR GoogleContainerTools#73 added the `_resolve` and this breaks the buildozer fix / autofix
jjmaestro
added a commit
to jjmaestro/rules_distroless
that referenced
this pull request
Sep 22, 2024
PR GoogleContainerTools#73 added the `_resolve` and this breaks the buildozer fix / autofix
thesayyn
pushed a commit
that referenced
this pull request
Oct 28, 2024
…87) * fix: MODULE.bazel.lock conflicts See bazelbuild/bazel#20369 While working on refactoring, I kept hitting rebase conflicts due to issues with the MODULE lock. I guess it's because the Bazel version in e2e tests is much lower than the current one with the fix (7.2) but still, I don't think it adds much to have the lock in e2e testing. * fix: repo name in copy.sh script PR #73 added the `_resolve` and this breaks the buildozer fix / autofix * fix: remove dead locks It seemed like 75afff9 in #47 added the new locks but as new files, that is, the old ones were left behind.
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.
Bzlmod locking was broken as well, this fixes it and reverts some changes from #70