epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-23 00:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fieldmate(release): Trigger rebuild from new fieldmate release (#10)

Browse source
This commit is contained in:
Digikwal 2025-07-30 11:34:33 +02:00 committed by GitHub
parent b3616b87a9
commit c96c7cb8d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.apps_versions/fieldmate.version
View file

@ -1 +1 @@
1751206484 1753865654

16
.github/workflows/auto-merge-fieldmate.yml vendored
View file

@ -18,22 +18,20 @@ jobs:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Enable auto-merge or fallback merge - name: Enable GitHub auto-merge
env: env:
GH_TOKEN: ${{ secrets.GH_RELEASE_PAT }} GH_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
PR_NUMBER: ${{ github.event.pull_request.number }} PR_NUMBER: ${{ github.event.pull_request.number }}
COMMIT_TITLE: "Auto-merge fieldmate release"
COMMIT_BODY: "Triggered by fieldmate release workflow"
run: | run: |
echo "Trying to enable auto-merge for PR #$PR_NUMBER" echo "ℹ️ Attempting GitHub auto-merge for PR #$PR_NUMBER"
# Try auto-merge first
gh pr merge "$PR_NUMBER" \ gh pr merge "$PR_NUMBER" \
--squash \ --squash \
--auto \ --auto \
--delete-branch \ --delete-branch \
--body "$COMMIT_BODY" \ --body "$COMMIT_BODY" \
--subject "$COMMIT_TITLE" || \
# Fallback: direct squash merge
gh pr merge "$PR_NUMBER" \
--squash \
--delete-branch \
--body "$COMMIT_BODY" \
--subject "$COMMIT_TITLE" --subject "$COMMIT_TITLE"
echo "✅ Auto-merge enabled"