Skip to content

Commit 2c2708e

Browse files
committed
fix: improve sync commit detection to prevent loops
- Check for 'sync version updates from main' in commit message - Check for 'Sync: main → develop' in PR title - Skip PRs from sync/main-to-develop branches - More robust detection to handle different merge strategies
1 parent 04a4045 commit 2c2708e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/integrate-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Create or Update PR to Staging
1515
runs-on: ubuntu-latest
1616
# Skip if this is a sync commit from main
17-
if: ${{ !contains(github.event.head_commit.message, 'chore: sync version updates from main') && !contains(github.event.head_commit.message, 'Sync: main → develop') }}
17+
if: ${{ !contains(github.event.head_commit.message, 'sync version updates from main') && !contains(github.event.head_commit.message, 'Sync: main → develop') && !startsWith(github.event.head_commit.message, 'Merge pull request') && github.event.head_commit.author.name != 'github-actions[bot]' || !contains(github.event.head_commit.message, 'sync/main-to-develop') }}
1818
permissions:
1919
contents: write
2020
pull-requests: write

0 commit comments

Comments
 (0)