@Sebclem - this one is for you, since I noticed you were trying to sync changes. This is something I've thought about before, but not actually looked into.
I've just implemented some changes to simplify the way this works, so that anyone can hopefully develop the default branch and be able to PR or merge upstream changes (ie. from me) into their fork.
It goes like this:
next
branch - the site powered by Next.js, React, Material UI
deploy
branch - the branch containing the data, and the one deployed to Vercel. There's a way that Next.js can be deployed to GH pages, but I like Vercel since it was so easy & fast.
The next
branch automatically merges to the deploy
branch any commits, like a mirror. Then the 'update stats' action runs and commits against the deploy
branch as well. The deploy
branch is yours, and won't ever be merged anywhere else.
Changes, should you want to implement this:
- Pull upstream workflow changes
- Create a
deploy
branch
- Change the 'Production' branch in Vercel - I'm not sure if you have set this up or not, or if it is deployed there by default because it is a fork of mine. No idea ๐คทโโ๏ธ.
I think that is how it should work. Feel free to adjust if necessary.