Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/gles-disable-docs-build into lp:ubuntu-ui-toolkit/staging
- gles-disable-docs-build
- Merge into staging
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Timo Jyrinki | ||||
Approved revision: | 2041 | ||||
Merged at revision: | 2041 | ||||
Proposed branch: | lp:~timo-jyrinki/ubuntu-ui-toolkit/gles-disable-docs-build | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
28 lines (+13/-0) 2 files modified
debian/bileto_convert_to_gles (+2/-0) debian/gles-disable-documentation.patch (+11/-0) |
||||
To merge this branch: | bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/gles-disable-docs-build | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Ubuntu SDK team | Pending | ||
Review via email: mp+301061@code.launchpad.net |
Commit message
Disable documentation building for GLES builds
Description of the change
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Timo Jyrinki (timo-jyrinki) wrote : | # |
This is now required.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'debian/bileto_convert_to_gles' |
2 | --- debian/bileto_convert_to_gles 2016-04-12 08:06:09 +0000 |
3 | +++ debian/bileto_convert_to_gles 2016-07-25 12:56:26 +0000 |
4 | @@ -12,6 +12,8 @@ |
5 | |
6 | sed --in-place 's/^ubuntu-ui-toolkit /ubuntu-ui-toolkit-gles /g' debian/changelog |
7 | |
8 | +patch -p1 < debian/gles-disable-documentation.patch |
9 | + |
10 | for gles in libubuntugestures5-gles.install libubuntugestures5-gles-dev.install libubuntutoolkit5-gles.install libubuntutoolkit5-gles-dev.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides qml-module-ubuntu-performancemetrics-gles.install ; do |
11 | mv --verbose debian/"$(echo $gles | sed 's/-gles//')" debian/$gles |
12 | done |
13 | |
14 | === added file 'debian/gles-disable-documentation.patch' |
15 | --- debian/gles-disable-documentation.patch 1970-01-01 00:00:00 +0000 |
16 | +++ debian/gles-disable-documentation.patch 2016-07-25 12:56:26 +0000 |
17 | @@ -0,0 +1,11 @@ |
18 | +--- a/ubuntu-sdk.pro.old 2016-07-25 15:39:16.754519000 +0300 |
19 | ++++ b/ubuntu-sdk.pro 2016-07-25 15:41:39.527828931 +0300 |
20 | +@@ -11,7 +11,7 @@ |
21 | + src_uitk_launcher.subdir = ubuntu-ui-toolkit-launcher |
22 | + src_uitk_launcher.depends = sub-src |
23 | + |
24 | +-SUBDIRS += po documentation app-launch-profiler src_uitk_launcher apicheck |
25 | ++SUBDIRS += po app-launch-profiler src_uitk_launcher apicheck |
26 | + |
27 | + sub_tests.CONFIG -= no_default_target |
28 | + sub_tests.CONFIG -= no_default_install |
FAILED: Continuous integration, rev:2041 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-armhf- stable/ 1089/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/4638/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-armhf- stable/ 1089/rebuild
https:/