Master and Beta VM

[lecorguille]

@pierrickrogermele

What do you think about that? ( hopefully, it's not to late to reverse 😄 )

Within this repository w4m-config maintain 2 branches:

• master
• beta

with to list of tools. master will for instance target the main toolshed and beta the testtoolshed.

In parallel, within w4m-docker and w4m-vm we have the same system with 2 branches:

• master
• beta

which will target their cousin w4m-config/master and w4m-config/beta:
.gitmodules/.gitmodules#L16

[submodule "w4m-config"]
	path = w4m-config
	url = https://github.com/workflow4metabolomics/w4m-config.git
	branch = beta

I kept master but maybe we should rename this branch lastest to fit with the docker nomenclature?

[pkrog]

I'm not sure about that.
The aim of having two branches is to be able to merge one into the other easily.
However the list tools inside the beta version is not going to be integrated blindly into the release version. Some tools won't be upgraded and others will. IMHO this is a work that has to be done by hand.

[lecorguille]

You can easly sync 2 branches by using git rebase and skip the .gitmodules file.
It's interesting for the docker project because the build are automatically launch by dockerhub and quay.io. That way, I ask them to watch the branches master, beta and release_*

Let try and see if there is big issue!?

[pkrog]

I don't mean the synchronization of w4m-docker or w4m-vm branches. I mean the synchronization between the two branches inside w4m-config. I can't see how it can be easy. The lists of tools can't be merged "as is", there is no reason we will just make a copy of beta tool list onto release tool list.
But I see what you want to do now. Give it a try if you want. However do it in two different branches (beta and release for instance), so I can go on using master branch. I have other issues to solve in the vm.

[lecorguille]

And indeed, you are right that the contain of the tool_list will be edit by hand.

[lecorguille]

Ok, I will create a branch latest from the current master
I can undo what I done on the master if you want to retrive the tool_list_LCMS_dev.yaml file

We should also rename those file by removing LCMS since there are some tools for GCMS and NMR!

[pkrog]

Yes, please, undo.
You're right those files have to be renamed.

[lecorguille]

Undo: done