Skip to content
This repository was archived by the owner on Apr 20, 2021. It is now read-only.

[2.x] Add branch-alias#229

Merged
sanpii merged 1 commit intoBehatch:2.xfrom
dunglas:patch-1
Dec 5, 2017
Merged

[2.x] Add branch-alias#229
sanpii merged 1 commit intoBehatch:2.xfrom
dunglas:patch-1

Conversation

@dunglas
Copy link
Copy Markdown
Contributor

@dunglas dunglas commented Dec 4, 2017

To allow to use the ^2.8@dev notation.

@sanpii
Copy link
Copy Markdown
Member

sanpii commented Dec 5, 2017

I don’t understand why #229 and #230 give two alias for the master branch.

Naively, I was write something like that:

    "extra": {
        "branch-alias": {
            "dev-2.x": "2.8.x-dev",
            "dev-master": "3.0.x-dev"
        }
    }

@sanpii
Copy link
Copy Markdown
Member

sanpii commented Dec 5, 2017

Tests fail due to Behat/MinkExtension#310

@dunglas
Copy link
Copy Markdown
Contributor Author

dunglas commented Dec 5, 2017

This one is buggy! Of course you’re right, it must point to the 2.x branch.

@sanpii
Copy link
Copy Markdown
Member

sanpii commented Dec 5, 2017

If it’s possible, you can make one PR for master, I will cherry pick it to 2.x branch.

@dunglas
Copy link
Copy Markdown
Contributor Author

dunglas commented Dec 5, 2017

IMO it should be 2 separate commit (it's useless to have this one in master).
In fact this commit looks ok (see https://github.com/symfony/symfony/blob/3.2/composer.json for instance).

@sanpii sanpii merged commit b4cbc2b into Behatch:2.x Dec 5, 2017
@sanpii
Copy link
Copy Markdown
Member

sanpii commented Dec 5, 2017

Ok, I follow your opinion, I don’t master branch aliases.

@sanpii sanpii added this to the 2.8.1 milestone Dec 11, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants