Skip to content

Conversation

@mattbuske
Copy link
Member

Enhances release operations with intelligent branch detection:

  • Automatically selects suitable target branch for release branching
  • Handles existing branches by recreating them if needed

Improves commit operations workflow by adding:

  • Support for multiple branches in triggers
  • Debug inputs for enhanced logging
  • Step to fix file permissions post-Docker actions

These changes ensure better automation and reliability in managing branches across different workflows.

mattbuske and others added 6 commits June 6, 2025 17:34
Resolves Docker container file ownership issues that cause git permission errors when the container creates files with different ownership than the GitHub Actions runner.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
- Add explicit branch patterns to ensure workflow triggers on develop/bridge-tests
- Add workflow_dispatch with debug input for manual testing
- This should resolve the issue where workflow wasn't triggering on pushes

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
The release operations composite action defaults to 'main' branch but the test environment uses 'test-release' branch. Added target_branch parameter to use the correct existing branch.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
The composite action has its own checkout step that resets repository state, losing the test-release branch. Changed target_branch to develop/bridge-tests which exists after the composite action's checkout.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Instead of hardcoding target branches, the action now:
- Uses current branch when target_branch doesn't exist
- Falls back to common branches (main, master, develop, staging)
- Uses remote branches as last resort
- Provides clear error messages with available branches

This makes the action work in any repository context automatically.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Added logic to detect existing release branches and recreate them for testing:
- Checks for local and remote branch existence
- Deletes existing branches before recreating
- Uses force push to overwrite remote test branches
- Prevents 'non-fast-forward' push errors in test environments

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
@mattbuske mattbuske merged commit fdbb087 into staging Jun 7, 2025
6 checks passed
github-actions bot pushed a commit that referenced this pull request Jun 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants