Merge lp:~sil2100/cupstream2distro-config/nohud_no_daily into lp:cupstream2distro-config

Proposed by Łukasz Zemczak on 2013-07-19
Status: Merged
Approved by: Łukasz Zemczak on 2013-07-22
Approved revision: 541
Merged at revision: 544
Proposed branch: lp:~sil2100/cupstream2distro-config/nohud_no_daily
Merge into: lp:cupstream2distro-config
Diff against target: 59 lines (+21/-20)
2 files modified
stacks/head/sdk.cfg (+0/-20)
stacks/no-dailies/sdk.cfg (+21/-0)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/nohud_no_daily
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-07-22
Francis Ginther Needs Information on 2013-07-22
Didier Roche 2013-07-19 Approve on 2013-07-19
Review via email: mp+175860@code.launchpad.net

Commit message

As per upstream, the unity-action-api-nohud branch is not meant for saucy, it's a compatibility project for earlier versions of Ubuntu - no need to keep it in head

Description of the change

As per upstream, the unity-action-api-nohud branch is not meant for saucy, it's a compatibility project for earlier versions of Ubuntu - no need to keep it in head

To post a comment you must log in.
Didier Roche (didrocks) wrote :

looking good!

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Francis Ginther (fginther) wrote :

sil2100, the entire unity-action-api-nohud block needs to be indented 1 extra space.

review: Needs Information
541. By Łukasz Zemczak on 2013-07-22

Eh, wrong ident

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/sdk.cfg'
2--- stacks/head/sdk.cfg 2013-07-19 10:02:29 +0000
3+++ stacks/head/sdk.cfg 2013-07-22 15:43:29 +0000
4@@ -59,26 +59,6 @@
5 configurations:
6 saucy-armhf:
7 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
8- unity-action-api-nohud:
9- daily_release: False
10- target_branch: lp:~unity-team/unity-action-api/nohud
11- hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov
12- archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
13- publish_coverage: '**/results/coverage.xml'
14- publish_junit: '**/results/*test*.xml'
15- autolanding:
16- distributions: precise,quantal,raring
17- ppa_target: ppa:ubuntu-sdk-team/ppa
18- configurations:
19- saucy-amd64: False
20- saucy-armhf: False
21- raring-amd64:
22- node_label: pbuilder
23- irc_notification: False
24- raring-armhf:
25- node_label: panda-pbuilder
26- irc_notification: False
27- archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
28 dee-qt:
29 contact_email: allan.lesage@canonical.com
30 ubuntu-html5-theme:
31
32=== modified file 'stacks/no-dailies/sdk.cfg'
33--- stacks/no-dailies/sdk.cfg 2013-07-18 15:09:53 +0000
34+++ stacks/no-dailies/sdk.cfg 2013-07-22 15:43:29 +0000
35@@ -30,3 +30,24 @@
36 publish_coverage: False
37 generic-mediumtests-saucy:
38 template: False
39+ unity-action-api-nohud:
40+ daily_release: False
41+ target_branch: lp:~unity-team/unity-action-api/nohud
42+ hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov
43+ archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
44+ publish_coverage: '**/results/coverage.xml'
45+ publish_junit: '**/results/*test*.xml'
46+ autolanding:
47+ distributions: precise,quantal,raring
48+ ppa_target: ppa:ubuntu-sdk-team/ppa
49+ configurations:
50+ saucy-amd64: False
51+ saucy-armhf: False
52+ raring-amd64:
53+ node_label: pbuilder
54+ irc_notification: False
55+ raring-armhf:
56+ node_label: panda-pbuilder
57+ irc_notification: False
58+ archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
59+

Subscribers

People subscribed via source and target branches

to all changes: