Git for real this time.

[billw2015]

UPDATE:
This information is out of date please see https://forums.civfanatics.com/threads/git-is-ready.649070/ for updated information.


The language with which people are discussing moving to git for development appears to now be in terms of "when", not "if", so I want to nail down specifics now.

Are we decided to use SVN for alpha/beta releases going forward?
This would mean we would periodically (either manually or automatically, or a combination) push builds to SVN consisting only of the release parts of the mod, no source or loose art assets. It would be like a the contents of a release, but in SVN. I think it is a good idea, players don't need to change anything at all.

Has anyone who isn't sure about this taken the small amount of time necessary to familiarize themselves with how to use git via one of the existing UI clients?
I made a video of setup from start to finish here for one of them (please make sure closed captions are enabled, although they should be by default). It takes 5 minutes and is hopefully pretty clear. If you want something like TortoiseSVN you could use TortoiseGit, but I think it is more complicated than what I present in that video.
If there is anything in there you don't understand or want help with, or you want want to use another client and want help with that then please reply here or start a thread! If you want more "live" help then discord might be a good place to ask. If it is for how to setup using a specific client then I can make a video showing how (I could do this for TortoiseGit for instance if people want to use it).

I will add more questions here when I think of them...

/edit
If you want to get a head start then sign up on github.com.

/edit 2
The video I linked above still points to the experimental repository, I will update it to point at the new one when it is ready.

 

[KaTiON_PT]

I'm ready for it!

 

[billw2015]

Update on that video that would make things even simpler is to not bother switching to the main-dev stream or whatever I called it. Instead do main dev in master, and have a separate stable branch for changes to go to SVN. Workflow is essentially a 1:1 mirror of SVN workflow for most people then. Except way faster.

 

[alberts8]

I setup a Organisaton for C2C on github i would need the email adresses of everybody to send out invitations.

 

[billw2015]

We can get them from sourceforge maybe?

 

[alberts8]

I don't think so.

I created a merge request for Initial setup and started to add files.
A few things must be still worked out like how to replace the version.h generation.

 

[JosEPh_II]

@alberts2
PM sent.

 

[billw2015]

Yeah WRT to version.h I can do something, but of course there is no such thing as *next* revision number in git. I will have a look at source indexing for git (I only did it with Perforce before), and then we can have appveyor make our dll builds, embed source indexing information for us along with git hash. On that note I sent an invite to c2c on github to install appveyor. Once done I can add the github team to appveyor team, and proceed from there.

 

[Toffer90]

My git username is: Toffer90
Isn't that enough information to invite me to the project?

 

[Thunderbrd]

You got me already on this right?

 

[alberts8]

My git username is: Toffer90
Isn't that enough information to invite me to the project?

Now you are a member!

You got me already on this right?

Exactly!

You are all members of the Developers group and that group has write access to the C2C repo but let me finish the initial setup first.

 

[alberts8]

@billw2015
So far everything seems to be working you could try out the Initial-Setup branch and comment here or on GitHub if you find problems.

I changed some of your scripts a bit to get C2C running from git!
These steps are necessary to setup C2C.

• Use the Install.bat
• Use the PackFPKs.bat
• And compile the dll

 

[alberts8]

Yeah WRT to version.h I can do something, but of course there is no such thing as *next* revision number in git

We don't really need a number a string created by git-describe would do.

 

[alberts8]

Here's a good article about working with git.
https://nvie.com/posts/a-successful-git-branching-model/

 

[billw2015]

Funny I literally just yesterday read the counter point to that article: https://barro.github.io/2016/02/a-succesful-git-branching-model-considered-harmful/

However I think most devs don't need to worry about either of these. I would suggest most devs work in master, and we can branch for features when we need to. It is not what I normally do but I think it better matches how this mod has been developed up until now. We then have a release branch (which I saw you added already) which we can merge to for automatic deployment to SVN.

 

[Thunderbrd]

At what point are we going to declare this the working environment as opposed to the SVN?

 

[billw2015]

We have a TO-DO list here, not all of it needs to be done, but definitely need to get FPK Live working for anyone who doesn't want to have to run the batch file to build the FPKs (or forgets to), and I want to get the pipeline for automating builds back to SVN in place as well.

 

[billw2015]

/edit Nevermind, I linked the github team to Appveyor and now everyone registered on github will have access. Just goto https://ci.appveyor.com/login and click github.

 

[alberts8]

@billw2015
I'am thinking about the branch names.

How about using a release branch for releases including betas and preview. These could be deployed to svn.

Instead calling the development branch master i would call it develop. That would make it easier for people who never used git to identify the purpose of these branches.

 

[billw2015]

I think yes for release branch, it was already my plan to automate deployment of any commits in that stream to SVN and maybe github release.
Not sure what you are saying exactly about develop branch, you mean rename master to develop, or have separate develop branch?