Keep `main-plugin` synced with `main`

[Maaack]

The main-plugin branch should stay synced with the main branch. This is being solved manually. An automated solution would be preferred.

[Shoghy]

You could try using git hooks, but unfortunately, hooks don't get uploaded to the GitHub repository, or at least the ones stored in the ./.git/hooks directory. However, you could create a .githooks directory and run

git config --local core.hooksPath .githooks/

so git execute the hooks stored in the .githooks directory, but you will need to run that command each time you change of computer.

[Shoghy]

If you're willing to do this, I think you just need to create file called post-commit inside the .githooks directory with the content:

#!/bin/sh
git checkout main-plugin
git merge main
git checkout main

and that should keep main-plugin synced with main, if there is no conflict.

[Maaack]

Thanks for the suggestions! I expect I'd need additional logic to switch back to my original branch, or only run the code when merging on main. This should help for merges done on my machine.

Though I do hope there is a solution that would work on GitHub, as I often handle merge requests through the web interface.

[Maaack]

I merged in the workflow provided by @3ter . First run resulted in an error because of the protection policy on any main* branches https://github.com/Maaack/Godot-Game-Template/actions/runs/13143409007 .

I tried updating with a version that creates a pull request instead. No errors, but it still didn't seem to work. No PR is visible in GitHub, and main-plugin is still behind.
https://github.com/Maaack/Godot-Game-Template/actions/runs/13143705939/job/36676721569

[Maaack]

Going to remove this workflow as it keeps failing (gracefully). Here are some interesting errors:

  /usr/bin/git rev-list --right-only --count main-plugin...1bc92e1d-794e-4fce-a22e-7599d9c468f6
  0
  /usr/bin/git -c protocol.version=2 fetch --no-tags --progress --no-recurse-submodules --force --depth=10 origin auto-merge-main-to-main-plugin:refs/remotes/origin/auto-merge-main-to-main-plugin
  fatal: couldn't find remote ref auto-merge-main-to-main-plugin
  Pull request branch 'auto-merge-main-to-main-plugin' does not exist yet.
  /usr/bin/git checkout --progress -B auto-merge-main-to-main-plugin 1bc92e1d-794e-4fce-a22e-7599d9c468f6 --
  Switched to a new branch 'auto-merge-main-to-main-plugin'
  /usr/bin/git rev-list --right-only --count main-plugin...auto-merge-main-to-main-plugin
  0
  Branch 'auto-merge-main-to-main-plugin' is not ahead of base 'main-plugin' and will not be created
  /usr/bin/git rev-parse main-plugin
  fedab05dcbdd63dbe170b3e9aee2e882d64a0f60
  /usr/bin/git -c core.quotePath=false show --raw --cc --no-renames --no-abbrev --format=%H%n%T%n%P%n%G?%n%s%n%b%n###EOB### fedab05dcbdd63dbe170b3e9aee2e882d64a0f60
  /usr/bin/git rev-parse auto-merge-main-to-main-plugin
  fedab05dcbdd63dbe170b3e9aee2e882d64a0f60
  /usr/bin/git branch --delete --force 1bc92e1d-794e-4fce-a22e-7599d9c468f6
  Deleted branch 1bc92e1d-794e-4fce-a22e-7599d9c468f6 (was fedab05d).
  /usr/bin/git checkout --progress main --
  Switched to branch 'main'
  Your branch is up to date with 'origin/main'.

And a warning:

[Create Pull Request](https://github.com/Maaack/Godot-Game-Template/actions/runs/18963948548/job/54156837264#annotation:4:1)
Unexpected input(s) 'head', valid inputs are ['token', 'branch-token', 'path', 'add-paths', 'commit-message', 'committer', 'author', 'signoff', 'branch', 'delete-branch', 'branch-suffix', 'base', 'push-to-fork', 'sign-commits', 'title', 'body', 'body-path', 'labels', 'assignees', 'reviewers', 'team-reviewers', 'milestone', 'draft', 'maintainer-can-modify']

I may revisit this in the future.