Skip to content

ci: skip tests when only main.pot changes (backport #36) - #37

Open
mergify[bot] wants to merge 1 commit into
version-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-36
Open

mergify[bot] wants to merge 1 commit into
version-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-36

Conversation

@mergify

@mergify mergify Bot commented Oct 17, 2026

Copy link
Copy Markdown
Contributor

Changes to main.pot do not change the behavior of the app. The .pot file is only the template for translations. This change adds **/locale/main.pot to paths-ignore, so a pull request that only changes this file does not start the test workflow.

A pull request that also changes other files still runs the tests.


This is an automatic backport of pull request #36 done by Mergify.

(cherry picked from commit f62195b)

# Conflicts:
#	.github/workflows/ci.yml
@mergify

mergify Bot commented Oct 17, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of f62195b has failed:

On branch mergify/bp/version-15-hotfix/pr-36
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit f62195b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@greptile-apps

greptile-apps Bot commented Oct 17, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 4/5

[Low impact] The change affects when this repository's CI workflow starts.

Resolve the workflow conflict before merging so app tests can run.

Reviews (1) · Last reviewed commit: "ci: skip tests when only main.pot change..." · Reviewed by Greptile

Comment thread .github/workflows/ci.yml
Comment on lines +7 to +13
<<<<<<< HEAD
- develop
=======
- version-16
paths-ignore:
- "**/locale/main.pot"
>>>>>>> f62195b (ci: skip tests when only main.pot changes (#36))

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Conflict markers break CI

Unresolved merge-conflict markers make .github/workflows/ci.yml invalid YAML. GitHub Actions cannot load the workflow, so app tests will not run even when a PR changes application code. Resolve the conflict, keep the target branch’s push filter, and retain both paths-ignore entries.

Suggested change
<<<<<<< HEAD
- develop
=======
- version-16
paths-ignore:
- "**/locale/main.pot"
>>>>>>> f62195b (ci: skip tests when only main.pot changes (#36))
- develop
paths-ignore:
- "**/locale/main.pot"
Prompt To Fix With AI
This is a comment left during a code review.
Path: .github/workflows/ci.yml
Line: 7-13

Comment:
**Conflict markers break CI**

Unresolved merge-conflict markers make `.github/workflows/ci.yml` invalid YAML. GitHub Actions cannot load the workflow, so app tests will not run even when a PR changes application code. Resolve the conflict, keep the target branch’s push filter, and retain both `paths-ignore` entries.

```suggestion
      - develop
    paths-ignore:
      - "**/locale/main.pot"
```

---

For each issue above, determine whether it is valid and should be fixed. If so, fix it directly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant