🔄 Integrate develop → staging #278
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add condition to skip integrate-develop workflow for sync commits from main - Prevents develop→staging→main→develop infinite loop - Ignores commits with 'chore: sync version updates from main' message
- Remove exit 1 when no changeset found - Changesets only required for actual package changes - Allow PRs for docs, CI/CD, and other non-package changes
- Enable auto-merge for main → develop sync PRs - Enable auto-merge for main → staging sync PRs - Automatically merge version synchronization to keep branches in sync - Uses --auto --merge flags to merge when all checks pass
- 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
- Remove unnecessary sync branch creation - Create PRs directly from main to develop/staging - Simplify infinite loop prevention logic - More efficient and cleaner workflow
This reverts commit a7c7e5d.
- Remove unnecessary PR creation for develop/staging sync - Push directly to develop and staging branches - No branch protection rules on these branches - Much simpler and faster synchronization
- Fix integrate-develop.yml condition syntax - Remove trailing spaces from update-version.yml - All workflows now pass yamllint validation
- Fix shell execution error caused by %0A in commit messages - Properly decode %0A, %0D, %25 back to readable format - Prevents 'command not found' errors in workflow
- Replace problematic variable substitution with file-based approach - Prevents shell command interpretation of commit messages - Safer handling of URL-encoded characters
- Use heredoc with placeholders instead of variable substitution - Process commits safely through temporary file - Completely prevent shell command interpretation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🚀 Integration from develop to staging
📊 Summary
📝 Recent Commits
🔍 What happens next?
⚡ Notes