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.

Sign up for GitHub

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(controller): git-push step: pull --rebase before push #3119

Merged

krancour merged 9 commits into akuity:main from krancour:krancour/pull-rebase

Dec 17, 2024

Merged

fix(controller): git-push step: pull --rebase before push #3119

git-push branch locks + retry tweaks

Codecov / codecov/patch succeeded Dec 17, 2024 in 0s

56.17% of diff hit (target 51.26%)

View this Pull Request on Codecov

56.17% of diff hit (target 51.26%)

Annotations

Check warning on line 334 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L324-L334

Added lines #L324 - L334 were not covered by tests

Check warning on line 344 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L336-L344

Added lines #L336 - L344 were not covered by tests

Check warning on line 346 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L346

Added line #L346 was not covered by tests

Check warning on line 534 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L533-L534

Added lines #L533 - L534 were not covered by tests

Check warning on line 540 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L537-L540

Added lines #L537 - L540 were not covered by tests

Check warning on line 550 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L542-L550

Added lines #L542 - L550 were not covered by tests

Check warning on line 552 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L552

Added line #L552 was not covered by tests

Check warning on line 563 in internal/controller/git/work_tree.go

codecov / codecov/patch

internal/controller/git/work_tree.go#L561-L563

Added lines #L561 - L563 were not covered by tests

Check warning on line 15 in internal/directives/errors.go

codecov / codecov/patch

internal/directives/errors.go#L14-L15

Added lines #L14 - L15 were not covered by tests

Check warning on line 131 in internal/directives/git_pusher.go

codecov / codecov/patch

internal/directives/git_pusher.go#L131

Added line #L131 was not covered by tests

Check warning on line 134 in internal/directives/git_pusher.go

codecov / codecov/patch

internal/directives/git_pusher.go#L134

Added line #L134 was not covered by tests

Check warning on line 160 in internal/directives/git_pusher.go

codecov / codecov/patch

internal/directives/git_pusher.go#L159-L160

Added lines #L159 - L160 were not covered by tests

Check warning on line 177 in internal/directives/git_pusher.go

codecov / codecov/patch

internal/directives/git_pusher.go#L171-L177

Added lines #L171 - L177 were not covered by tests

Check warning on line 131 in internal/directives/simple_engine_promote.go

codecov / codecov/patch

internal/directives/simple_engine_promote.go#L122-L131

Added lines #L122 - L131 were not covered by tests

Check warning on line 153 in internal/directives/simple_engine_promote.go

codecov / codecov/patch

internal/directives/simple_engine_promote.go#L146-L153

Added lines #L146 - L153 were not covered by tests

View more details on Codecov