Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Sep 8, 2025

Summary

Automated back-merge of hotfix v1.1.1 from main to develop branch.

Details

What this PR does

  • Syncs develop branch with main after hotfix merge
  • Ensures develop has all changes from the v1.1.1 hotfix
  • Maintains Git Flow branching model integrity
  • Automatically resolves common version conflicts (keeps develop version if newer)

Auto-generated

This PR was automatically created by GitHub Actions.

Review and merge when ready - this should typically be a straightforward merge unless there are conflicts that need manual resolution.

ryanaidilp and others added 6 commits September 8, 2025 23:28
- Remove invalid --output flag from changelog generation
- Fix invalid context access in workflow summary
- Ensure deployment workflow triggers properly on tag creation
- Remove create-release.yml to prevent conflicts with release-automation.yml
- Both workflows triggered on same events and created duplicate tags
- release-automation.yml provides comprehensive GitFlow workflow
- deploy.yml already handles GitHub release creation after deployment
- Update version to 1.1.1 in package.json

- Generate release changelog

This commit prepares the hotfix/v1.1.1 branch for hotfix.
fix: correct changelog script arguments in create-release workflow
ryanaidilp and others added 4 commits September 8, 2025 23:40
Following release branch creation for v1.1.0, updating develop

branch to target the next minor version v1.2.0.

Changes:

- Update package.json version to 1.2.0

- Prepare for next development cycle

This maintains the Git Flow pattern where develop always contains

the next planned version.
@ryanaidilp ryanaidilp force-pushed the chore/back-merge-v1.1.1-to-develop branch from bceffac to bf8c2f6 Compare September 8, 2025 16:48
@ryanaidilp ryanaidilp self-requested a review September 8, 2025 16:49
@ryanaidilp ryanaidilp merged commit c3dddbb into develop Sep 8, 2025
@ryanaidilp ryanaidilp deleted the chore/back-merge-v1.1.1-to-develop branch September 8, 2025 16:55
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.

2 participants