Skip to content

Conversation

@Vikramarjuna
Copy link
Contributor

The current backport assistant is failing and at times raising PRs with empty commit. The primarily reason observed for this is that when the PR is squashed and merged and then the source branch is deleted. Since the branch is deleted, it is not able to find the commits.

Permanent solution is to fix the backport assistant such that the PR is squashed, pick the commit from the main instead of the PR commits.

Temporary solution is to disable auto deletion of the source branch post PR merge and clearly them periodically using a workflow.

This PR adds the workflow to delete the stale PRs after 180 days when there are no open PRs associated with it.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

PCI review checklist

  • I have documented a clear reason for, and description of, the change I am making.

  • If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.

  • If applicable, I've documented the impact of any changes to security controls.

    Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.

@Vikramarjuna Vikramarjuna requested a review from a team as a code owner August 29, 2025 04:00
@github-actions github-actions bot added type/ci Relating to continuous integration (CI) tooling for testing or releases theme/contributing Additions and enhancements to community contributing materials labels Aug 29, 2025
@Vikramarjuna Vikramarjuna added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport labels Aug 29, 2025
@Vikramarjuna Vikramarjuna merged commit 31b8891 into main Aug 29, 2025
221 of 230 checks passed
@Vikramarjuna Vikramarjuna deleted the vikram/delete-stale-branches branch August 29, 2025 04:31
sreeram77 added a commit that referenced this pull request Aug 29, 2025
* fix: golangci-lint staticcheck errors (#22642)

* fix: golangci-lint staticcheck errors

* fix: missing braces for else in mesh_gateway.go

* fix: remove unnecessary type check in otel_sink_test.go

* fix: golangci-lint issues (#22644)

* upgrade: golangci-lint to v2 (#22648)

* fix: golangci-lint issues

* migrate golangci-lint config to v2

* upgrade: golangci-lint to v2.4.0

* fix: linter issues in agent/consul (#22651)

* Fixing bind addr issue, ipv6 bracket, valid peering token issue m go-discover update (#22584)

* Fixing bind addr issue, ipv6 bracket and valid peering token issue

* Making addr and port compatible with ipv6

* Updating go-discover to v1.1.0

* Updating testcases

* chore:added workflow to delete stale branches (#22658)

* upgrade: go to v1.25 (#22652)

* update: go version to 1.25

* update: gotestsum version

* update: mog, buf and deep-copy

* fix: add workaround to install covdata in go toolchain

* update: regen proto files

* fix: install deep-copy with go 1.23

* add: changelog

* update: regen deepcopy files

* fix: non-constant format string in formatter

* upgrade: mockery and proto-gen, and regen files (#22634)

* update: mockery to v3 and generate mocks

* update: protoc-gen to v1.5.1 and regen proto go files

* fix: use InterfaceName_mock.go for filename in mockery

* update: generate mock files with mockery v3

* fix: case in structname in mockery config

* update: testcase errMsg in TestPatchStruct

* update: increase timeout for context in TestSubscribeBackend_IntegrationWithServer_TLSReload

---------

Co-authored-by: Sreeram Narayanan <[email protected]>
Co-authored-by: P Ajay Rao <[email protected]>
Co-authored-by: Vikramarjuna <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants