Merge lp:~sil2100/cupstream2distro-config/cleanup_and_add_unity-mir into lp:cupstream2distro-config

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Ken VanDine
Approved revision: 637
Merged at revision: 641
Proposed branch: lp:~sil2100/cupstream2distro-config/cleanup_and_add_unity-mir
Merge into: lp:cupstream2distro-config
Diff against target: 58 lines (+19/-19)
1 file modified
stacks/head/platform.cfg (+19/-19)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/cleanup_and_add_unity-mir
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+180077@code.launchpad.net

Commit message

Sort the platform stack projects alphabetically

Description of the change

Sort the platform stack projects alphabetically

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
637. By Łukasz Zemczak

Don't add unity-mir, it'll be done separately - now just sort

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/head/platform.cfg'
--- stacks/head/platform.cfg 2013-08-14 12:29:54 +0000
+++ stacks/head/platform.cfg 2013-08-14 12:57:16 +0000
@@ -28,31 +28,12 @@
28 content-hub:28 content-hub:
29 contact_email: thomas.voss@canonical.com29 contact_email: thomas.voss@canonical.com
30 daily_release: False # To be enabled once packaging is reviewed and project ready30 daily_release: False # To be enabled once packaging is reviewed and project ready
31 powerd:
32 configurations:
33 saucy-i386: False
34 saucy-amd64: False
35 platform-api:
36 force-rebuild: True # force rebuild as Mir is changing ABI everyday
37 condition-force-rebuild: ../mir/mir.project* # rebuild everytime there is a Mir in the pipe
38 qtubuntu:
39 hooks: D09add_ppa~phablet-team~ppa D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders
40 configurations:
41 saucy-i386: False
42 saucy-amd64: False
43 qtubuntu-sensors:
44 dbus-cpp:31 dbus-cpp:
45 contact_email: thomas.voss@canonical.com32 contact_email: thomas.voss@canonical.com
46 publish_junit: '**/results/*test*.xml'33 publish_junit: '**/results/*test*.xml'
47 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'34 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
48 publish_coverage: '**/results/coverage.xml'35 publish_coverage: '**/results/coverage.xml'
49 hooks: H10enable_coverage B10gcovr_run B09googletests36 hooks: H10enable_coverage B10gcovr_run B09googletests
50 location-service:
51 contact_email: thomas.voss@canonical.com
52 publish_junit: '**/results/*test*.xml'
53 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
54 publish_coverage: '**/results/coverage.xml'
55 hooks: H10enable_coverage B10gcovr_run B09googletests
56 dee:37 dee:
57 hooks: B09copy_results H10enable_coverage B10gcovr_run D10install_lcov38 hooks: B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
58 archive_artifacts: '**/results/**'39 archive_artifacts: '**/results/**'
@@ -61,3 +42,22 @@
61 saucy-armhf:42 saucy-armhf:
62 hooks: B09copy_results43 hooks: B09copy_results
63 publish_coverage: False44 publish_coverage: False
45 location-service:
46 contact_email: thomas.voss@canonical.com
47 publish_junit: '**/results/*test*.xml'
48 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
49 publish_coverage: '**/results/coverage.xml'
50 hooks: H10enable_coverage B10gcovr_run B09googletests
51 platform-api:
52 force-rebuild: True # force rebuild as Mir is changing ABI everyday
53 condition-force-rebuild: ../mir/mir.project* # rebuild everytime there is a Mir in the pipe
54 powerd:
55 configurations:
56 saucy-i386: False
57 saucy-amd64: False
58 qtubuntu:
59 hooks: D09add_ppa~phablet-team~ppa D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders
60 configurations:
61 saucy-i386: False
62 saucy-amd64: False
63 qtubuntu-sensors:

Subscribers

People subscribed via source and target branches

to all changes: