Commit graph

7 commits

Author SHA1 Message Date
Digikwal
b70e31fec6
Update auto-merge-fieldmate.yml 2025-07-30 13:57:25 +02:00
Digikwal
c96c7cb8d2
fieldmate(release): Trigger rebuild from new fieldmate release (#10) 2025-07-30 09:34:33 +00:00
digikwal
1d4637f720
Merge branch 'main' of github.com:digikwal/frappe_docker
# Conflicts:
#	.github/workflows/auto-merge-fieldmate.yml
2025-06-26 23:31:19 +02:00
Digikwal
2e0b19a98d
chore(fieldmate): Trigger rebuild from new fieldmate release (#1) 2025-06-26 23:25:59 +02:00
Digikwal
2c6cb26747
chore(fieldmate): Trigger rebuild from new fieldmate release (#1) 2025-06-26 23:11:04 +02:00
Digikwal
08713bc55a
chore: switch to fine-grained PAT 2025-06-26 21:34:12 +02:00
Digikwal
867716dc33
ci: Auto-merge PRs from fieldmate releases
This commit introduces a GitHub Actions workflow that automatically merges pull requests created by the fieldmate release process.

What it does:
- Detects PRs from branches starting with `fieldmate-auto-release`
- Attempts to enable auto-merge via GitHub CLI
- Falls back to direct squash merge if auto-merge is not possible
- Uses consistent commit messages and descriptions

This ensures that updates to fieldmate in frappe_docker are propagated cleanly and automatically, triggering rebuilds where needed.
2025-06-26 16:39:10 +02:00