Skip to content

Conversation

@rbclark
Copy link
Contributor

@rbclark rbclark commented Apr 21, 2017

It turns out that due to a mistake in https://github.com/projectcypress/cypress-recipe/blob/master/resources/install_app.rb#L9 that all users are already running 2.2.6 anyway, so we may as well develop against it as well.

rbclark added a commit to projectcypress/cypress-recipe that referenced this pull request Apr 21, 2017
Make sure our built versions build off a specific version, not just the 2.2 latest release. This is in conjunction with projectcypress/cypress#817 in order to bring the two into sync.
Copy link

@okeefm okeefm left a comment

Choose a reason for hiding this comment

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

Yay latest Ruby

@rbclark
Copy link
Contributor Author

rbclark commented Apr 26, 2017

Is the proper way for me to fix this to target this towards the 3.2 branch or some different way?

@okeefm
Copy link

okeefm commented Apr 26, 2017

If you're targeting 3.2, you should make the Pull Request against the cypress_3_2 branch

@rbclark
Copy link
Contributor Author

rbclark commented Apr 27, 2017

That was more meant in reference to the failing bundler audit since we are on an insecure version of nokogiri on master. Does that mean we are not planning to have another point release for the 3.1 branch? If we are then this PR should be against master since otherwise the upgrade script will try to downgrade everyone who is running the latest version of the cypress vm down to ruby 2.2.5. If we are not going to have another 3.1.x point release though then there is no problem with this being against 3.2.

@okeefm
Copy link

okeefm commented Apr 28, 2017

This pull request can be made against the cypress_3_2 branch, as we don't anticipate any further 3.1.x point releases.

@rbclark rbclark changed the base branch from master to cypress_3_2 April 28, 2017 18:55
It turns out that due to a mistake in https://github.com/projectcypress/cypress-recipe/blob/master/resources/install_app.rb#L9 that all users are already running 2.2.6 anyway, so we may as well develop against it as well.
@rbclark rbclark force-pushed the rbclark-patch-1 branch from d76fdef to 484d548 Compare May 1, 2017 14:34
@okeefm okeefm merged commit 147bf7f into cypress_3_2 May 2, 2017
@okeefm okeefm deleted the rbclark-patch-1 branch May 2, 2017 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants