Skip to content

Fix Actions pull_request.paths being triggered incorrectly by rebase (#36045)#36054

Merged
lunny merged 3 commits into
go-gitea:release/v1.25from
Zettat123:backport/36045-to-1.25
Nov 29, 2025
Merged

Fix Actions pull_request.paths being triggered incorrectly by rebase (#36045)#36054
lunny merged 3 commits into
go-gitea:release/v1.25from
Zettat123:backport/36045-to-1.25

Conversation

@Zettat123
Copy link
Copy Markdown
Contributor

Backport #36045

Partially fix #34710

The bug described in #34710 can be divided into two parts: push.paths and pull_request.paths. This PR fixes the issue related to pull_request.paths. The root cause is that the check for whether the workflow can be triggered happens before updating the PR’s merge base. This causes the file-change detection to use the old merge base. Therefore, we need to update the merge base first and then check whether the workflow can be triggered.

go-gitea#36045)

Partially fix go-gitea#34710

The bug described in go-gitea#34710 can be divided into two parts: `push.paths`
and `pull_request.paths`. This PR fixes the issue related to
`pull_request.paths`. The root cause is that the check for whether the
workflow can be triggered happens **before** updating the PR’s merge
base. This causes the file-change detection to use the old merge base.
Therefore, we need to update the merge base first and then check whether
the workflow can be triggered.
@GiteaBot GiteaBot added this to the 1.25.3 milestone Nov 28, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 28, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 28, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 28, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 29, 2025
@lunny lunny enabled auto-merge (squash) November 29, 2025 05:17
@lunny lunny merged commit b276849 into go-gitea:release/v1.25 Nov 29, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 29, 2025
@xnox xnox mentioned this pull request Dec 7, 2025
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 27, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants