Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: automate merging develop to next minor branch #9305

Conversation

paulbalandan
Copy link
Member

Description
Source: https://github.com/everlytic/branch-merge

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@michalsn
Copy link
Member

michalsn commented Dec 6, 2024

Won't it produce too many unnecessary commits? Also, there is a question about conflicts.

@paulbalandan
Copy link
Member Author

Hmm, you're right. Maybe instead of every push to develop we can set the action to on: workflow_call? This means we can manually merge thru the GitHub platform directly instead of using local computer.

@michalsn
Copy link
Member

michalsn commented Dec 6, 2024

Yes, that would be better. But I wonder if the merge commit will be marked as verified.

@paulbalandan
Copy link
Member Author

It seems it's not the case unless we use a PAT and setup signing info in the repo.

@paulbalandan
Copy link
Member Author

I'll close this for now.

@paulbalandan paulbalandan deleted the automate-merge-develop-to-minor branch December 7, 2024 11:14
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