Skip to content
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

fix: e2e MODULE.bazel.lock conflicts and repo name in copy.sh script #87

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

jjmaestro
Copy link
Contributor

@jjmaestro jjmaestro commented Sep 19, 2024

fix: MODULE.bazel.lock conflicts

See bazelbuild/bazel/issues/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.

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.
PR GoogleContainerTools#73 added the `_resolve` and this breaks the buildozer fix / autofix
It seemed like 75afff9 in GoogleContainerTools#47 added the new locks but as new files, that
is, the old ones were left behind.
@jjmaestro jjmaestro force-pushed the fix-MODULES-lock-and-repo-name-in-copy-script branch from 847f6e8 to 22ba9e5 Compare September 22, 2024 18:43
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.

1 participant