Skip to content

Conversation

@Zettat123
Copy link
Contributor

@Zettat123 Zettat123 commented Nov 27, 2025

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.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 27, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Nov 27, 2025
@Zettat123 Zettat123 changed the title Fix Actions push.paths being triggered incorrectly by rebase Fix Actions pull_request.paths being triggered incorrectly by rebase Nov 27, 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
@silverwind silverwind enabled auto-merge (squash) November 28, 2025 17:49
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 28, 2025
@silverwind silverwind merged commit f4e38e6 into go-gitea:main Nov 28, 2025
23 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Nov 28, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 28, 2025
Zettat123 added a commit to Zettat123/gitea that referenced this pull request Nov 28, 2025
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.
@Zettat123 Zettat123 added the backport/done All backports for this PR have been created label Nov 28, 2025
lunny pushed a commit that referenced this pull request Nov 29, 2025
#36045) (#36054)

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.
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 2, 2025
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix bug when updating user email (go-gitea#36058)
  Add "Go to file", "Delete Directory" to repo file list page (go-gitea#35911)
  Replace `lint-go-gopls` with additional `govet` linters (go-gitea#36028)
  Fix Actions `pull_request.paths` being triggered incorrectly by rebase (go-gitea#36045)
silverwind added a commit to silverwind/gitea that referenced this pull request Dec 2, 2025
* origin/main:
  [skip ci] Updated translations via Crowdin
  Fix bug when updating user email (go-gitea#36058)
  Add "Go to file", "Delete Directory" to repo file list page (go-gitea#35911)
  Replace `lint-go-gopls` with additional `govet` linters (go-gitea#36028)
  Fix Actions `pull_request.paths` being triggered incorrectly by rebase (go-gitea#36045)
  Fix error handling in mailer and wiki services (go-gitea#36041)
  Update JS deps, fix deprecations (go-gitea#36040)
  Fix incorrect viewed files counter if file has changed (go-gitea#36009)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/done All backports for this PR have been created backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Gitea Actions paths filters incorrectly trigger during rebase operations

4 participants