Skip to content

Conversation

@tooomm
Copy link
Contributor

@tooomm tooomm commented Jun 9, 2025

Fixes #220

The script and comparison logic is kept unchanged, but the workflow around changed.

Pushes a new version to master branch for each change to the tokens.xml file on the same.
The workflow only runs for pushes that are not created by itself by checking the commit message to prevent loops.
Using a concurrency group should ensure to bump the version for each change still, even if they are queued due to several merges.

@tooomm tooomm merged commit 32893b6 into master Jun 9, 2025
@tooomm tooomm deleted the automated-version-bump branch June 9, 2025 10:29
@tooomm
Copy link
Contributor Author

tooomm commented Jun 14, 2025

@ebbit1q FYI

This works like a charm when merging PR's, or pushing to master directly.
Within a few secs after the commit, a version bump happens automatically.
No more manual version bumps needed!

@ebbit1q
Copy link
Member

ebbit1q commented Jul 16, 2025

I considered this option in the past but found it to be suboptimal as it means all of these extra commits get made instead of squashing them into one, however my idea of having the bot push to the pr branch on review didn't always work because of permissions (the bot only is allowed access to the repo it's on) my alternative would be to make the workflow update and merge but it is more complicated and I never got around to it.

@tooomm
Copy link
Contributor Author

tooomm commented Aug 23, 2025

I don't think this is a real issue.
If we have to evaluate comfort & robustness vs. avoiding some extra commits, I'm very much in favor of the first.

If you want to build an even better solution, sure!
For now, this is a simple way that always works (also for changes from external branches/forks).

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.

rethink merge workflow

2 participants