Merge lp:~renatofilho/address-book-app/skip-s390-build into lp:address-book-app
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Zemczak on 2016-08-23 |
| Approved revision: | 621 |
| Merged at revision: | 621 |
| Proposed branch: | lp:~renatofilho/address-book-app/skip-s390-build |
| Merge into: | lp:address-book-app |
| Diff against target: |
72 lines (+15/-15) 2 files modified
debian/control (+14/-14) debian/control.in (+1/-1) |
| To merge this branch: | bzr merge lp:~renatofilho/address-book-app/skip-s390-build |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Zemczak | 2016-08-22 | Approve on 2016-08-23 | |
| system-apps-ci-bot | continuous-integration | Needs Fixing on 2016-08-22 | |
|
Review via email:
|
|||
Commit Message
Avoid building the package for s390x arch by introducing a s390x qtdeclarative5-
FAILED: Continuous integration, rev:621
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 620. By Renato Araujo Oliveira Filho on 2016-08-22
-
Avoid build pakcage for s390 arch.
| Łukasz Zemczak (sil2100) wrote : | # |
Ok, a quick question first: are you sure you want to just add the s390x arch-dependency for this one package? It's not that it's bad, just not really a clean solution I must say. The best would be to add s390x to ARCHS in the bileto hook. Yes, this would add it to all places where ARCHS is used, but IIUC it will still dep-wait on s390x because this one package is not available. The pro of this approach is that we don't introduce fragmentation and all ARCH data will be currently in one place (in the bileto hook).
But that being said, it's just a matter how you prefer it really.
Just a small nitpick: if you prefer to stay with the solution as is now, could you also do the same small modification in debian/control? debian/control is auto-generated, but I prefer it to always have 'sane' contents (in-sync with control.in) in case someone does a quick check of debian/control before running the hook (or autoclean).
- 621. By Renato Araujo Oliveira Filho on 2016-08-23
-
Autogenerate a new version of debian/control.
> Ok, a quick question first: are you sure you want to just add the s390x arch-
> dependency for this one package? It's not that it's bad, just not really a
> clean solution I must say. The best would be to add s390x to ARCHS in the
> bileto hook. Yes, this would add it to all places where ARCHS is used, but
> IIUC it will still dep-wait on s390x because this one package is not
> available. The pro of this approach is that we don't introduce fragmentation
> and all ARCH data will be currently in one place (in the bileto hook).
>
> But that being said, it's just a matter how you prefer it really.
>
> Just a small nitpick: if you prefer to stay with the solution as is now, could
> you also do the same small modification in debian/control? debian/control is
> auto-generated, but I prefer it to always have 'sane' contents (in-sync with
> control.in) in case someone does a quick check of debian/control before
> running the hook (or autoclean).
I prefer to use this approach because this is the only package missing on s390. (this is the package that is causing the build to keep waiting for deps).
| Łukasz Zemczak (sil2100) wrote : | # |
Ok, in that case let's go with this. Before building the package modify the commit message to be more verbose, something like: "Avoid building the package for s390x arch by introducing a s390x qtdeclarative5-
But besides that - approved.
PASSED: Continuous integration, rev:620
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/