crisu83 / yiistrap

Twitter Bootstrap for the Yii PHP framework.
http://www.getyiistrap.com
BSD 3-Clause "New" or "Revised" License
286 stars 176 forks source link

Release bs3 #285

Closed marcovtwout closed 9 years ago

marcovtwout commented 9 years ago

Is there any planning to update master to bs3, or to make a (beta) release of this branch?

crisu83 commented 9 years ago

Honestly I don't have any time to test it and make sure that it works. As far I know there are still a lot of people using the master branch. I guess we could move that to another branch and release the bs3 branch.

marcovtwout commented 9 years ago

Any news on this?

crisu83 commented 9 years ago

I'm still not sure how many uses the master branch and how many uses the bs3 branch but the only option I see is to create swap master to bs2 and make the bs3 branch the new master branch. Do you see any problem with this solution @marcovtwout?

marcovtwout commented 9 years ago

That seems like the way to go, and you could increment the major version to 2.x for the new release. bs2 will then be your previous release branch, I assume mostly used for 1.x bugfixes.

marcovtwout commented 9 years ago

Looking at: https://github.com/crisu83/yiistrap/branches You could probably remove the develop and stable branches? And maybe rename the older release branch "bs2" to "1.x" for more clarity?

marcovtwout commented 9 years ago

It would be great if you could solve this issue soon. Then we can include a stable yiistrap in our projects without possibly breaking it on every composer update.

crisu83 commented 9 years ago

The problem with renaming master is that it would break for everyone else. You can always use a specific commit hash through composer to lock down your version. I know that it's not what you're looking for but it should do while we are thinking about a better alternative.

marcovtwout commented 9 years ago

If you rely on dev-master, it is bound to break at some point, whenever the author starts work on the next major release.

But if you really want to keep master as-is, you could also do:

And you will have:

Development then continues on both branches, tagging releases where needed. And for starters, you could then tag develop -> 2.0.0 :)

crisu83 commented 9 years ago

Let's do this, I'll create a bs2 branch (old master) and give people using the current master some time to move to that branch (say a month). What we can do in the mean while is delete the old develop branch and branch the current bs3 branch as develop (leaving the bs3 branch as is for now). Then we can create a new master branch later of that new develop. How does this sound?

marcovtwout commented 9 years ago

Sounds good! And maybe you can already create this branch alias:

"extra": {
    "branch-alias": {
        "dev-develop": "2.0.x-dev"
    }
}

So we can already set this just once in our projects' composer.json:

"crisu83/yiistrap": ~2.0

(combined with min-stability: dev and prefer-stable: true, or with @dev)

marcovtwout commented 9 years ago

Hey, any chance you could get this done soon?

marcovtwout commented 9 years ago

An ETA is all I need, otherwise I'll have to fork and republish it myself. :/

marcovtwout commented 9 years ago

I guess this project is dying, I made the changes on my own fork and will maintain that one.

crisu83 commented 9 years ago

Hello @marcovtwout I'm not sure about the future of this project, but I know that it's very useful to a lot of people. The problem is that I have almost no time to maintain it due to my other responsibilities (work, family, studies). I'll do the necessary branching right now and hope that it works out without problems.

crisu83 commented 9 years ago

This has now been done, sorry for the long delay.