Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Install 5.x-dev recipe when testing master. #25

Merged
merged 4 commits into from
Jul 1, 2018
Merged

Install 5.x-dev recipe when testing master. #25

merged 4 commits into from
Jul 1, 2018

Conversation

maxime-rainville
Copy link
Contributor

Parent issue silverstripeltd/open-sourcerers#31

robbieaverill
robbieaverill suggested changes Jun 27, 2018
View reviewed changes
Copy link
Contributor

@robbieaverill robbieaverill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need composer constraints bumped on the master branch too. At the moment this module's master branch is for the next SilverStripe 4.x minor release (we should create a 1 branch for that while we're at it)

@robbieaverill
Install 5.x-dev recipe when testing master.
ea988ed 
Parent issue silverstripeltd/open-sourcerers#31
@robbieaverill robbieaverill force-pushed the pulls/2/target-recipe-5x-dev-in-travis branch from cf50c92 to ea988ed Compare June 29, 2018 04:51
robbieaverill
robbieaverill approved these changes Jun 29, 2018
View reviewed changes
Copy link
Contributor

@robbieaverill robbieaverill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Branching done in master and have rebased and updated a couple of things here.

The tests might not pass due to PHPUnit moving to 7 in SilverStripe 5, but happy to merge now and fix later

robbieaverill
robbieaverill approved these changes Jul 1, 2018
View reviewed changes
Copy link
Contributor

@robbieaverill robbieaverill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@robbieaverill
Copy link
Contributor

We can fix Behat later

@robbieaverill robbieaverill merged commit 4c982ed into silverstripe:master Jul 1, 2018
@maxime-rainville maxime-rainville deleted the pulls/2/target-recipe-5x-dev-in-travis branch July 1, 2018 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robbieaverill robbieaverill robbieaverill approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maxime-rainville @robbieaverill