I have a basic but common WordPress workflow question.
Current Workflow
It looks like you're not using version control at all. It's a good idea that you're going to start. I just converted from SVN to Git, and I'm sort of doing what you're doing at a grander level. Let's start with your objectives:
People will tell you that Git is not a web deployment tool - they may be right, but so far it is working ok for me, and I did something similar. Lucky for you, I practiced on a Wordpress install - here's the steps that I took.
git init
the base install with no modificationsNow, what I ended up going back and doing was creating a gitolite
server VM and using that as my host - this effectively replaced github in your example. I think you know the value of a remote repository - I would definitely pursue that route.
I'm going to backtrack for a second on step 2 of my recommendations. You should keep the vanilla version of Wordpress on the master so you can upgrade the core and see how it plays with your custom code, instead of upgrading the core on something like one of your branches and everything breaking. This has been pretty convenient for me, and something that I'm going to definitely use on larger projects like Magento.
Ok, back to the deployment. You could put a git client on your webserver and have it pull
from its branch in the workflow - but you have to take some special planning considerations. Your prod files will most likely be different than your dev files in certain places, particularly configuration (database, etc) - you're going to want to make sure that those files are in .gitignore
so you're not pulling up dev
configs into your prod
environment.
I've mostly summed up what people told me when I started working on this so I hope it helps. Again, I'm just slightly past where you are, so if anyone has any corrections/optimizations, please feel free to comment.
I understand it's so annoying and tiresome that's why a lot of developers choose a professional way to do it. This will not only help them save their time but also improve their work productivity. Basically, there are two major scenarios in WordPress GitHub development workflow. The first one, using WordPress and Github in a live environment, and the other one when you are working in a local environment. Where local workflow is simple. All you need to do is just push and pull the changes from GitHub to local or vice versa.
(working in a live environment with multiple teams is quite complex)
In a live environment workflow, first, you have to push Live WordPress site files to the GitHub Repository then Pull them to the Local Folder.
After that, Build Development Environment on the local Machine (edit the code) and Push from Local to GitHub.
Now, for pulling the changes to the live environment first you need to connect GitHub with Live Environment.
You can read this detailed WordPress and GitHub guide and I hope this will help you out: https://www.cloudways.com/blog/wordpress-github/
I'm beginning to set up such a workflow for Wordpress. I already have it working for a few other web projects.
I'm using the gitolite (https://github.com/sitaramc/gitolite/wiki/) tool for managing bare repositories (repositories without a local checkout) in a central location, then triggering an update hook in gitolite when a branch is pushed from the development location.
This hook then ssh's to the live server (or client's account or whatever) with a shared private key stored on the deployment server, and does a git pull from the public_html or whatever location you have serving your Wordpress install.
This is done using a read-only entry in the gitolite config file which is conf/gitolite.conf in the local configuration repository. (Gitolite uses a git repository to manage it's config files)
repo wp-versions
RW+ = tmzt
R = server1
R = server2
The first is my primary public key, which is stored keydir/tmzt.pub in the same repository (same format as .ssh/authorized_keys). The other two are live web servers which will have read-only access to the repository. Add the three keys to keydir and make sure to commit and push. The changes will be automatically made in the gitolite installation. (The server keys are shared by multiple users and copied to the .ssh/id_rsa file of each user, but this could www-data if you prefer).
RW+ means my primary user has read, write, and can update non fast-forward branches (useful for reverting commits on the server).