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.

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

[Documentation] Explain how to contribute using vagrant #8715

Merged
merged 5 commits into from
Oct 17, 2017

Conversation

loic425
Copy link
Member

@loic425 loic425 commented Sep 21, 2017

Q A
Bug fix? no
New feature? no
BC breaks? no
Related tickets
License MIT

@pamil pamil added the Documentation Documentation related issues and PRs - requests, fixes, proposals. label Sep 21, 2017
@pamil pamil added this to the 1.0 milestone Sep 21, 2017

This article assumes you're familiar with `Composer`_, a dependency manager
for PHP. It also assumes you have `Composer installed globally`_.
Basic knowledgle about `Vagrant <https://www.vagrantup.com/about.html>`_ is also required,
Copy link
Member

Choose a reason for hiding this comment

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

knowledgle -> knowledge

Copy link
Member Author

@loic425 loic425 Sep 21, 2017

Choose a reason for hiding this comment

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


.. _Gulp: http://gulpjs.com/
.. _Node.js: https://nodejs.org/en/download/


How to contribute using Sylius Vagrant
Copy link
Member

Choose a reason for hiding this comment

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

I think it would be much better to keep vagrant description in repo readme and here just create a link to the repo.

How to contribute using Sylius Vagrant

If you would like to contribute to the repo without worrying about environment, you can follow this guide to setup you vagrant machine

--------------------------------------

If you would like to contribute to the repo without worrying about environment, you can follow `this guide <https://github.com/Sylius/Vagrant/blob/master/README.md#configure-vagrant-to-contribute-on-sylius-core>`_ to setup you vagrant machine

Copy link
Member

Choose a reason for hiding this comment

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

redundant blank line

@lchrusciel
Copy link
Member

@loic425 For me it is ready to merge, but unfortunately, the build is failing. We need to wait for #8722 to be merged to branch 1.0 and rebase it then. It is not something related to your changes, I suppose.

@lchrusciel
Copy link
Member

@loic425 my bad. It will be enough if you just rebase to the newest 1.0 and it is ready to merge

@lchrusciel
Copy link
Member

Sorry, my bad. #8722 has been merged to 1.0. So all you need to do is to rebase 1.0 with the upstream.

How to contribute using Sylius Vagrant
--------------------------------------

If you would like to contribute to the repo without worrying about environment, you can follow `this guide <https://github.com/Sylius/Vagrant/blob/master/README.md#configure-vagrant-to-contribute-on-sylius-core>`_ to setup you vagrant machine
Copy link
Member

Choose a reason for hiding this comment

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

you -> your
And a missing . at the end of sentence.

@loic425
Copy link
Member Author

loic425 commented Sep 22, 2017

Ok cool I will fix them all on monday and make a rebase.

@loic425 loic425 force-pushed the docs/contributing-with-vagrant branch 2 times, most recently from ca54173 to ac3c1b8 Compare September 26, 2017 12:38
@loic425
Copy link
Member Author

loic425 commented Sep 26, 2017

@lchrusciel @CoderMaggie I've tried to rebase and it dit not work. I've tried another method (same i've used with lcruschiel on another PR).

git checkout -b backup/docs/contributing-with-vagrant
git branch -d docs/contributing-with-vagrant
git checkout 1.0
git pull upstream 1.0
git checkout -b docs/contributing-with-vagrant
git cherry-pick 7c26b6cd6ffab2ef5b63336f778d271c08d78227
git cherry-pick c0bcdf3760b2de78f1730c51b6d056949a2159b8
git cherry-pick 3fc6495b35ff3f2123411339c10271d6ac15151a
git cherry-pick ca54173832807bc3222415f6c181075e5e661b82
git push docs/contributing-with-vagrant --force

And the build failed: https://travis-ci.org/Sylius/Sylius/jobs/279942407

@Zales0123
Copy link
Member

@loic425 rebase seems to work (at least commits are fine), the failing build is due to some docs errors... I don't is it something new, or it was fixed before, we need @CoderMaggie for that 😄

@loic425
Copy link
Member Author

loic425 commented Sep 27, 2017

@Zales0123 Ok thanks. @CoderMaggie Let me know if I have to change something on this Pull-request.

@pamil
Copy link
Contributor

pamil commented Sep 27, 2017

Cleared the cache for failing build and rerun it, let's see if the error is still there :)

@loic425
Copy link
Member Author

loic425 commented Sep 27, 2017

@pamil can I clear the cache for failing build or is this something one of your team can do ?

@pamil
Copy link
Contributor

pamil commented Sep 27, 2017

@loic425 unfortunately Travis allows for that only for those with push access to the repository

@loic425
Copy link
Member Author

loic425 commented Oct 4, 2017

@pamil @pjedrzejewski Is it possible to clear travis cache in order to conclude this pull-request ? :)

@lchrusciel
Copy link
Member

@loic425 the problems seems not to be with cache itself, rather some internal Sylius error. As the main build seems to be green, can you rebase it to the newest 1.0 one more time?

@loic425
Copy link
Member Author

loic425 commented Oct 10, 2017

@pamil I've seen you tried to rebase it. This is weird...

@CoderMaggie
Copy link
Member

@loic425 the failing build is fixed now in #8825
Can you make a rebase to 1.0 one last time? :)

@loic425
Copy link
Member Author

loic425 commented Oct 12, 2017

@CoderMaggie Ok, I will make a rebase today.

@loic425 loic425 force-pushed the docs/contributing-with-vagrant branch from ac3c1b8 to 4ba555b Compare October 13, 2017 08:33
@loic425
Copy link
Member Author

loic425 commented Oct 13, 2017

@CoderMaggie docs build still fail on travis :(

I used a cherry pick method to apply the commits.

How to contribute using Sylius Vagrant
--------------------------------------

If you would like to contribute to the repo without worrying about environment, you can follow `this guide <https://github.com/Sylius/Vagrant/blob/master/README.md#configure-vagrant-to-contribute-on-sylius-core>`_ to setup your vagrant machine.
Copy link
Member

Choose a reason for hiding this comment

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

This reference https://github.com/Sylius/Vagrant/blob/master/README.md#configure-vagrant-to-contribute-on-sylius-core is failing the build @loic425 :(

Can we do it this way?:

If you would like to contribute to the repo without worrying about environment, you can follow 
`the "Configure Vagrant to contribute on Sylius Core" section here <https://github.com/Sylius/Vagrant/blob/master/README.md>`_ 
to setup your vagrant machine.

Copy link
Member Author

Choose a reason for hiding this comment

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

@CoderMaggie cool you found why this build fail. I'm gonna do that on monday.

@loic425
Copy link
Member Author

loic425 commented Oct 16, 2017

@CoderMaggie Build is now ok :)

@CoderMaggie CoderMaggie merged commit ade5aec into Sylius:1.0 Oct 17, 2017
@CoderMaggie
Copy link
Member

Thanks @loic425 :)

@lchrusciel
Copy link
Member

🎉

@loic425
Copy link
Member Author

loic425 commented Oct 17, 2017

@CoderMaggie @lchrusciel after a lot of rebases and such annoying steps, it's finally merged :)

@lchrusciel
Copy link
Member

I hope it won't stop you from contributing to us :D

@loic425
Copy link
Member Author

loic425 commented Oct 17, 2017

@lchrusciel lol, of course not:)

@loic425 loic425 deleted the docs/contributing-with-vagrant branch February 26, 2018 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Documentation related issues and PRs - requests, fixes, proposals.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants