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

ERROR ... Failed to create branch ... nothing to commit, working tree clean #426

Closed
vorburger opened this issue Mar 4, 2025 · 2 comments · Fixed by #435
Closed

ERROR ... Failed to create branch ... nothing to commit, working tree clean #426

vorburger opened this issue Mar 4, 2025 · 2 comments · Fixed by #435

Comments

@vorburger
Copy link
Contributor

This failed like this:

[main] INFO org.virtuslab.bazelsteward.app.PullRequestManager - Creating branch bazel-steward/protobuf/29.3, current PR status: OPEN_MODIFIED
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git checkout --quiet -b bazel-steward/protobuf/29.3
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git add /home/runner/work/enola/enola/MODULE.bazel
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git commit --quiet -m "Updated protobuf to 29.3"
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - sh -c "buildifier --lint=fix -r ."
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git add **/*.bzl **/BUILD MODULE.bazel MODULE.bazel.lock WORKSPACE.bazel
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git git diff --quiet --exit-code --cached
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git commit --quiet -m "clean(deps): Buildifieraroo"
[main] ERROR org.virtuslab.bazelsteward.app.PullRequestManager - Failed to create branch bazel-steward/protobuf/29.3
java.lang.RuntimeException: /usr/bin/git commit --quiet -m clean(deps): Buildifieraroo
On branch bazel-steward/protobuf/29.3
nothing to commit, working tree clean
	at org.virtuslab.bazelsteward.core.common.CommandRunner$Companion.runForOutput(CommandRunner.kt:28)
	at org.virtuslab.bazelsteward.core.common.CommandRunner$Companion$runForOutput$2.invokeSuspend(CommandRunner.kt)
	at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33)
	at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:104)
	at kotlinx.coroutines.EventLoopImplBase.processNextEvent(EventLoop.common.kt:277)
	at kotlinx.coroutines.BlockingCoroutine.joinBlocking(Builders.kt:95)
	at kotlinx.coroutines.BuildersKt__BuildersKt.runBlocking(Builders.kt:69)
	at kotlinx.coroutines.BuildersKt.runBlocking(Unknown Source)
	at kotlinx.coroutines.BuildersKt__BuildersKt.runBlocking$default(Builders.kt:48)
	at kotlinx.coroutines.BuildersKt.runBlocking$default(Unknown Source)
	at org.virtuslab.bazelsteward.app.Main$Companion.main(Main.kt:14)
	at org.virtuslab.bazelsteward.app.Main.main(Main.kt)
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git checkout --quiet main

[main] INFO org.virtuslab.bazelsteward.app.PullRequestManager - Creating branch bazel-steward/rules_go/0.53.0, current PR status: OPEN_MODIFIED
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git checkout --quiet -b bazel-steward/rules_go/0.53.0
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git add /home/runner/work/enola/enola/MODULE.bazel
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git commit --quiet -m "Updated rules_go to 0.53.0"
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - sh -c "buildifier --lint=fix -r ."
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git add **/*.bzl **/BUILD MODULE.bazel MODULE.bazel.lock WORKSPACE.bazel
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git git diff --quiet --exit-code --cached
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git commit --quiet -m "clean(deps): Buildifieraroo"
[main] ERROR org.virtuslab.bazelsteward.app.PullRequestManager - Failed to create branch bazel-steward/rules_go/0.53.0
java.lang.RuntimeException: /usr/bin/git commit --quiet -m clean(deps): Buildifieraroo
On branch bazel-steward/rules_go/0.53.0
nothing to commit, working tree clean
	at org.virtuslab.bazelsteward.core.common.CommandRunner$Companion.runForOutput(CommandRunner.kt:28)
	at org.virtuslab.bazelsteward.core.common.CommandRunner$Companion$runForOutput$2.invokeSuspend(CommandRunner.kt)
	at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33)
	at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:104)
	at kotlinx.coroutines.EventLoopImplBase.processNextEvent(EventLoop.common.kt:277)
	at kotlinx.coroutines.BlockingCoroutine.joinBlocking(Builders.kt:95)
	at kotlinx.coroutines.BuildersKt__BuildersKt.runBlocking(Builders.kt:69)
	at kotlinx.coroutines.BuildersKt.runBlocking(Unknown Source)
	at kotlinx.coroutines.BuildersKt__BuildersKt.runBlocking$default(Builders.kt:48)
	at kotlinx.coroutines.BuildersKt.runBlocking$default(Unknown Source)
	at org.virtuslab.bazelsteward.app.Main$Companion.main(Main.kt:14)
	at org.virtuslab.bazelsteward.app.Main.main(Main.kt)
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git checkout --quiet main
[main] INFO org.virtuslab.bazelsteward.app.PullRequestManager - Creating branch bazel-steward/io.kubernetes/client-java/23.0.0, current PR status: OPEN_MODIFIED
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git checkout --quiet -b bazel-steward/io.kubernetes/client-java/23.0.0
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git add /home/runner/work/enola/enola/MODULE.bazel
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git commit --quiet -m "Updated io.kubernetes:client-java to 23.0.0"
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - sh -c "REPIN=1 bazelisk run @enola_maven//:pin"
[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git add maven_install.json
(...)

It's probably because enola-dev/enola#1176 & enola-dev/enola#1175 already exist.

Perhaps I can work around this, but I guess in a perfect world it would perhaps be nice if this "just worked".

It may be the root cause of #422 ?

@vorburger
Copy link
Contributor Author

Perhaps I can work around this

Actually, no; this is not workaroundable here. Because it's the git that fails, not the buildifier.

but I guess in a perfect world it would perhaps be nice if this "just worked".

So this would have to be fixed in Bazel Steward.

The only "workaround" for now is simply not to use buildifier, and hope for the best that Bazel Steward doesn't mess with the formatting.

@lukaszwawrzyk
Copy link
Collaborator

It was a stupid bug, quite hard to notice

[main] INFO org.virtuslab.bazelsteward.core.common.CommandRunner - /usr/bin/git git diff --quiet --exit-code --cached

notice the double git git call.

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 a pull request may close this issue.

2 participants