This repository has been archived by the owner on May 16, 2024. It is now read-only.
[FIX] wkhtmltox build arg #451
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
moylop260
approved these changes
Jun 16, 2017
moylop260
reviewed
Jun 16, 2017
travis/travis_install_nightly
Outdated
| @@ -82,7 +84,7 @@ if [ "$clone_result" != "0" ]; then | |||
| exit $clone_result | |||
| fi; | |||
|
|
|||
| if [ "${WKHTMLTOPDF_VERSION}" != "" ]; then | |||
| if [ "${WKHTMLTOPDF_VERSION}" != "SKIP" ]; then | |||
| echo "Install webkit (wkhtmltopdf) patched version ${WKHTMLTOPDF_VERSION}" | |||
| (cd ${HOME}/maintainer-quality-tools/travis/ && wget -qO- -t 1 --timeout=240 https://downloads.wkhtmltopdf.org/0.12/${WKHTMLTOPDF_VERSION}/wkhtmltox-${WKHTMLTOPDF_VERSION}_linux-generic-amd64.tar.xz | tar -xJ --strip-components=2 wkhtmltox/bin/wkhtmltopdf) | |||
There was a problem hiding this comment.
Should we change the url to use github here? (without checksum process)
There was a problem hiding this comment.
I thought you said to leave that in #450? That's the only thing that PR consists of now
There was a problem hiding this comment.
The diffs should align I think regardless of merge order due to not editing the same or bordering lines?
There was a problem hiding this comment.
The travis is red IMHO we need change the url to use the new github URL (if we are forcing a installation by default)
lasley
force-pushed
the
bugfix/run-wkhtmltox-install
branch
2 times, most recently
from
1d19277 to
fd21163
Compare
|
Alright this should be 🍏 now |
seb-elico
added a commit
to Elico-Corp/odoo-docker
that referenced
this pull request
Jun 19, 2017
seb-elico
added a commit
to Elico-Corp/odoo-docker
that referenced
this pull request
Jun 19, 2017
seb-elico
added a commit
to Elico-Corp/odoo-docker
that referenced
this pull request
Jun 19, 2017
seb-elico
added a commit
to Elico-Corp/odoo-docker
that referenced
this pull request
Jun 19, 2017
* Add missing WKHTMLTOPDF_VERSION declaration and use a SKIP arg instead of blank
lasley
force-pushed
the
bugfix/run-wkhtmltox-install
branch
from
fd21163 to
7f6bd3b
Compare
|
Rebased to solve conflicts. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This env var was introduced in #449, but doesn't exist anywhere.
Additionally - In order to avoid having to change all our Travis files, I propose that we skip the installation with the value
SKIP, otherwise we install the version we have defined (0.12.4)