Skip to content

fix(gitea): platform automerge only fully works on Gitea v1.24 and Forgejo v10 #33871

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

Merged
merged 2 commits into from
Jan 27, 2025

Conversation

viceice
Copy link
Member

@viceice viceice commented Jan 27, 2025

Changes

Set delete_branch_after_merge when enabling automerge, so on Gitea v1.24+ and Forgejo v10+ branches are deleted after automerge.
They otherwise trigger new updates which should be blocked by release age. See linked repo for false pr.

Context

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@viceice viceice requested review from rarkins and secustor January 27, 2025 13:57
@viceice
Copy link
Member Author

viceice commented Jan 27, 2025

secustor
secustor previously approved these changes Jan 27, 2025
@viceice viceice marked this pull request as draft January 27, 2025 14:19
@viceice viceice force-pushed the feat/gitea-branch-autodelete branch from afbb2c1 to e9c7066 Compare January 27, 2025 14:28
@viceice viceice marked this pull request as ready for review January 27, 2025 14:29
@viceice viceice requested a review from secustor January 27, 2025 14:29
@viceice viceice changed the title feat(gitea): add branch auto delete fix(gitea): platform automerge only fully works on Gitea v1.24 and Forejo v10 Jan 27, 2025
@viceice viceice changed the title fix(gitea): platform automerge only fully works on Gitea v1.24 and Forejo v10 fix(gitea): platform automerge only fully works on Gitea v1.24 and Forgejo v10 Jan 27, 2025
@viceice viceice enabled auto-merge January 27, 2025 14:34
Copy link
Contributor

@earl-warren earl-warren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, otherwise LGTM.

@viceice viceice added this pull request to the merge queue Jan 27, 2025
Merged via the queue into main with commit 5f5c4d1 Jan 27, 2025
49 of 56 checks passed
@viceice viceice deleted the feat/gitea-branch-autodelete branch January 27, 2025 14:56
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 39.136.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 27, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants