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

[WIP] Travis integration #3328

Merged
merged 10 commits into from Mar 20, 2014

Conversation

Projects
None yet
6 participants
@wouterj
Copy link
Member

wouterj commented Dec 14, 2013

Q A
Doc fix? no
New docs? no
Applies to all
Fixed tickets #2722, #3332
Todo
  • Using sparse checkout
  • Update contributing docs
  • Squashing commits
  • Activate Travis hook (@fabpot)
@xabbuh

This comment has been minimized.

Copy link
Member

xabbuh commented Dec 15, 2013

👍

@xabbuh

This comment has been minimized.

Copy link
Member

xabbuh commented Dec 15, 2013

Maybe it's better to use symlinks than moving the bundle references around.

@wouterj

This comment has been minimized.

Copy link
Member

wouterj commented Dec 15, 2013

Well, that'll be replaced by using sparse checkout, I just couldn't get it working yesterday.

@tvlooy

This comment has been minimized.

Copy link
Contributor

tvlooy commented Dec 15, 2013

@wouterj I'm unable to open a PR to your fork. Can you pull this? tvlooy@b0e5412 That should work.

FYI, I also tried with git-archive, which is able to download a directory from a repository but unfortunately GitHub doesn't allow git-archive requests. And I also tried with the SVN support which works too, but for some reason it downloads the directory for all tags and branches. So, you end up with a much much bigger download. Anyway, git sparse checkout work :-)

@wouterj

This comment has been minimized.

Copy link
Member

wouterj commented Dec 16, 2013

Thank you @tvlooy! It all works perfect

SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build

This comment has been minimized.

@weaverryan

weaverryan Dec 26, 2013

Member

The make.bat file? Isn't this one just for Windows? I use the Makefile locally. Also, what about only including the options we need - namely make html?

This comment has been minimized.

@wouterj

wouterj Dec 26, 2013

Member

Yes, the standard sphinx setup includes the make commands for unix and windows.

This comment has been minimized.

@weaverryan

weaverryan Dec 27, 2013

Member

But we don't need both, do we? Don't we just need a small Makefile? I guess we should clarify - are we packaging enough to allow users to build or are we packaging only what we need to make Travis able to build?

This comment has been minimized.

@wouterj

wouterj Dec 27, 2013

Member

while, this PR is created in the first place to solve #2722, which is about providing enough to make it work for a user. For travis, we don't need time (I think).

sparse_checkout doctrine DoctrineFixturesBundle
sparse_checkout doctrine DoctrineMigrationsBundle
sparse_checkout doctrine DoctrineMongoDBBundle
git clone http://github.com/symfony-cmf/symfony-cmf-docs cmf

This comment has been minimized.

@weaverryan

weaverryan Dec 26, 2013

Member

cmf? ;)

This comment has been minimized.

@wouterj

wouterj Dec 26, 2013

Member

Yes, for some reason, the cms in included in the core docs instead of a seperate sphinx project (although this causes some issues in the docs)

@@ -0,0 +1,3 @@
[submodule "sphinx-php"]
path = _exts
url = http://github.com/fabpot/sphinx-php

This comment has been minimized.

@weaverryan

weaverryan Dec 26, 2013

Member

I think I'd rather put this inside install.sh (e.g. clone it there) than having it as a submodule. I just really don't like submodules :). Or we could even use Composer.

This comment has been minimized.

@wouterj

wouterj Dec 26, 2013

Member

We cannot use composer, as we activated python on travis. We can use pip (or pep or how that python tool is called), but the fabot sphinx extension is not such an package.

@weaverryan

This comment has been minimized.

Copy link
Member

weaverryan commented Dec 26, 2013

👍 I really like this idea - so let's get it done!

Thanks Wouter!

@wouterj

This comment has been minimized.

Copy link
Member

wouterj commented Feb 1, 2014

I've updated the docs for this new PR. It should be ready now!

ini INI
php-annotations Annotations
php-standalone Standalone Use
php-symfony Framework Use

This comment has been minimized.

@wouterj

wouterj Feb 1, 2014

Member

added php-standalone and php-symfony, since they were introduced in fabpot/sphinx-php#3

weaverryan added a commit that referenced this pull request Feb 18, 2014

feature #3558 Created Documentation CHANGELOG (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

Created Documentation CHANGELOG

| Q   | A
| --- | ---
| Doc fix? | no
| New docs? | yes
| Applies to | 2.3+
| Fixed tickets | #2579

This is the second enhancement (after #3328) of the Symfony2 Documentation Process.

This idea came from @shoomyth in #2579. Since @weaverryan is using gh to merge the Pull Requests, it's easy to scan through the commits and find the changes (I'm busy creating an automated script for this).

The plan is to update the changelog each month, so people have a clear view on new articles or fixed things. It'll also be another attribution to the many symfony doc hero's!
This PR lists the changes in the 2.3 branch for January. When we agree with this, it'll be update for changes in the 2.4 and master branches.

My idea was to put a link to this article in the sidebar (ping @fabpot).

We would love to get your opinion about this new change!

Commits
-------

401737b Applied comments from @xabbuh
a6c68a9 Added CHANGELOG for 2.3

rogeriopradoj added a commit to rogeriopradoj/symfony-docs-pt-BR that referenced this pull request Mar 5, 2014

Include submodules, conf.py and Makefile of symfony/symfony-docs#3328
Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
@wouterj

This comment has been minimized.

Copy link
Member

wouterj commented Mar 9, 2014

ping @weaverryan I know you're busy, but I really want to move on with this idea.

weaverryan added a commit that referenced this pull request Mar 20, 2014

feature #3328 [WIP] Travis integration (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[WIP] Travis integration

| Q   | A
| --- | ---
| Doc fix? | no
| New docs? | no
| Applies to | all
| Fixed tickets | #2722, #3332

##### Todo

 - [x] Using sparse checkout
 - [x] Update contributing docs
 - [ ] Squashing commits
 - [ ] Activate Travis hook (@fabpot)

Commits
-------

37eb137 Update documentation
8dec729 sparse checkouts
b6f693e Added CMF
b1d9e62 Revert changes
6cad008 Updated travis config
c515613 Added .gitignore
85b1b02 Try to supress bundle doc warnings
f3cb8b1 Fixed submodules
71a2ff4 Added needed config files
d312683 Added sphinx files

@weaverryan weaverryan merged commit 37eb137 into symfony:2.3 Mar 20, 2014

@weaverryan

This comment has been minimized.

Copy link
Member

weaverryan commented Mar 20, 2014

Merged at last! :)

@fabpot or @javiereguiluz - could you activate the Travis hook in the repo settings and turn symfony/symfony-docs on inside Travis?

Thanks especially to Wouter for doing all the work on this. I'm sorry it took so long for me to merge it!

@wouterj wouterj deleted the wouterj:travis_integration branch Mar 20, 2014

@wouterj

This comment has been minimized.

Copy link
Member

wouterj commented Mar 20, 2014

Wow, thank you @weaverryan Now let's move to the other plans! :D

@javiereguiluz

This comment has been minimized.

Copy link
Member

javiereguiluz commented Mar 22, 2014

@weaverryan @wouterj thanks for setting up Travis integration! I have asked @fabpot about enabling the webhook, so I guess it will be activated soon.

@fabpot

This comment has been minimized.

Copy link
Member

fabpot commented Mar 22, 2014

Travis hook activated!

@wouterj

This comment has been minimized.

Copy link
Member

wouterj commented Mar 22, 2014

Great, thank you @javiereguiluz and @fabpot !

weaverryan added a commit that referenced this pull request Mar 24, 2014

minor #3658 Fix PSR coding standards error (ifdattic)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix PSR coding standards error

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |

Commits
-------

da2ee60 Fix PSR coding standards error
868de1e minor #3698 Dynamic form modification cookbook: Fix inclusion of code  (michaelperrin)
acf255d feature #3328 [WIP] Travis integration (WouterJ)
5d99d88 [#3697] Backporting 2.3-specific changes
1e8b0d4 Small fixes in code style
8093719 Dynamic form modification cookbook: Fix inclusion of code
37eb137 Update documentation
8dec729 sparse checkouts
b6f693e Added CMF
b1d9e62 Revert changes
6cad008 Updated travis config
c515613 Added .gitignore
85b1b02 Try to supress bundle doc warnings
f3cb8b1 Fixed submodules
71a2ff4 Added needed config files
d312683 Added sphinx files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment