New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master branch for examples #2225

Closed
ryandawsonuk opened this Issue Nov 30, 2018 · 1 comment

Comments

2 participants
@ryandawsonuk
Copy link
Member

ryandawsonuk commented Nov 30, 2018

Example projects now use master and not develop branches

To handle this in the release process, the script can check for a develop branch and use it if it exists Activiti/activiti-scripts#12

The branch chosen by the script will be tagged and a docker image published from it.

However, this means we need to remove the develop branches as they are still present for all of the example-level repos listed in:

https://github.com/Activiti/activiti-scripts/blob/master/repos-activiti-cloud-examples.txt
https://github.com/Activiti/activiti-scripts/blob/master/repos-activiti-cloud-modeling-examples.txt
https://github.com/Activiti/activiti-scripts/blob/master/repos-activiti-examples.txt

There is no advantage to keeping both of the master and develop branches for these repos as we no longer merging develop into master on a release. It would be complex to do so as we release from a jx tag which replaces versions within the tag and not develop and this is therefore history missing develop. Also we're already using master for some of these repos because that's the jx default.

@ryandawsonuk ryandawsonuk created this issue from a note in Activiti 7.x (Open) Nov 30, 2018

@ryandawsonuk ryandawsonuk added the risk label Nov 30, 2018

@ryandawsonuk ryandawsonuk added this to the Beta4 milestone Nov 30, 2018

@ryandawsonuk

This comment has been minimized.

Copy link
Member

ryandawsonuk commented Nov 30, 2018

referenced this issue in an unrelaed pr by accident - haven't made any changes for this so far

@salaboy salaboy closed this Dec 4, 2018

Activiti 7.x automation moved this from Open to Closed Dec 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment