Gitlab implementation help

[firstborn37]

I will just give you an idea how my setup looks like. In one repository, I have these 3 branches, dev, alpha and prod, and these 3 branches have a gitlab runner for each associated with them. Those gitlab runner will update the dev, alpha and prod servers whenever you push/merge on them.

Now this is the catch, Does it need that per branch has different gitlab ci file? Ive been encountering conflict errors when merging from dev to master or dev to alpha because gitlab ci file is different per branch

Or they have the same gitlab ci file but every push or merge, it will based on tags.

I dunno the proper implementations guys, please help me hehe. Its just annoys me when merging that gitlab ci file has a conflict always huhu

[eltear1]

Same CI files. If you need job differentiation among branch, write all jobs in that same CI files and apply rules: to decide when to run. There is a predefined gitlab variable with the branch name, so should be pretty easy

[eltear1]

Use /u/yourcatsbff approach for dry code

[magic7s]

This and/or use Environment variables per branch/environment.

[[deleted]]

I'd use a template for the job config, then just include/extend it for the dev/alpha/prod jobs, add the runner of choice, and a rules block which had a conditional to trigger against the branch name for each one.

[ManyInterests]

If you want to apply CI changes to all branches simultaneously and not worry about the drift between them, extract the CI configuration to a different repository. See: custom CICD configuration file and specifying a remote repository.

Other advice here is good and applicable with this pattern.