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

[ADD] fetch openupgrade 10.0 docs too #1125

Merged
merged 2 commits into from
Oct 11, 2017

Conversation

hbrunn
Copy link
Member

@hbrunn hbrunn commented Oct 7, 2017

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:

--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

@hbrunn hbrunn added this to the 11.0 milestone Oct 7, 2017
@hbrunn
Copy link
Member Author

hbrunn commented Oct 7, 2017

the script pulls the default branch btw, should we change the default to 11 by now?

@pedrobaeza
Copy link
Member

Yes, let's change the default branch at this stage. Should we freeze the branch to be cloned on the scripts for avoiding errors on new releases until it's manually fixed?

@hbrunn
Copy link
Member Author

hbrunn commented Oct 7, 2017

better not, then we don't notice the errors. Note that building the docs is part of the tests

@pedrobaeza
Copy link
Member

Default branch changed. Waiting for Travis result for merging.

@hbrunn
Copy link
Member Author

hbrunn commented Oct 7, 2017

the error here is what we want, this turns green when OCA/openupgradelib#83 is merged

@hbrunn
Copy link
Member Author

hbrunn commented Oct 10, 2017

restarted build after @pedrobaeza merged the PR in openupgradelib

@pedrobaeza
Copy link
Member

Restarting Travis now that the other PR has been merged.

@pedrobaeza
Copy link
Member

hahaha, we are both the quickest gunman on this side of Odoo

@pedrobaeza
Copy link
Member

Can you squash both commits?

@@ -6,7 +6,8 @@ DOC_PARTS="7.0/openerp/openupgrade/doc/source/modules50-60.rst
7.0/openerp/openupgrade/doc/source/modules60-61.rst
7.0/openerp/openupgrade/doc/source/modules61-70.rst
8.0/openerp/openupgrade/doc/source/modules70-80.rst
9.0/openerp/openupgrade/doc/source/modules80-90.rst"
9.0/openerp/openupgrade/doc/source/modules80-90.rst
10.0/odoo/openupgrade/doc/source/modules90-100.rst"
Copy link
Member

Choose a reason for hiding this comment

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

Can we put the quote in other line for avoiding 2 lines diff on each version?

Copy link
Member

Choose a reason for hiding this comment

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

Think optimistic ;-) The optimistic way is to merge and then create a new PR yourself

Copy link
Member

Choose a reason for hiding this comment

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

Well, I don't know very well this part. That's why I'm asking if it can be done.

Copy link
Member Author

Choose a reason for hiding this comment

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

added

@hbrunn hbrunn force-pushed the 11.0-fix-build-openupgrade-docs branch from 1e164b7 to 79e0579 Compare October 11, 2017 10:59
@hbrunn
Copy link
Member Author

hbrunn commented Oct 11, 2017

I think it would be conceptually wrong to squash those two commits as they do very different things

@pedrobaeza
Copy link
Member

Thanks, merging then with 2 commits.

@pedrobaeza pedrobaeza merged commit 58210e7 into OCA:11.0 Oct 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants