Merge lp:~renatofilho/messaging-app/shared-snappy into lp:messaging-app
- shared-snappy
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Roberto Mier Escandon |
Approved revision: | 610 |
Merged at revision: | 608 |
Proposed branch: | lp:~renatofilho/messaging-app/shared-snappy |
Merge into: | lp:messaging-app |
Prerequisite: | lp:~renatofilho/messaging-app/fix-snap-paths |
Diff against target: |
97 lines (+55/-22) 1 file modified
snapcraft.yaml (+55/-22) |
To merge this branch: | bzr merge lp:~renatofilho/messaging-app/shared-snappy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Approve | |
Roberto Mier Escandon (community) | Approve | ||
Review via email: mp+311598@code.launchpad.net |
Commit message
Use ubuntu-app-platform snap plugin.
Description of the change
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
- 607. By Renato Araujo Oliveira Filho
-
Added gsettings needed plug and qtdeclarative5-
gsettings1. 0 dependency
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:607
https:/
Executed test runs:
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:/
- 608. By Renato Araujo Oliveira Filho
-
Remove deps present on ubuntu-
app-platform.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:608
https:/
Executed test runs:
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:/
- 609. By Renato Araujo Oliveira Filho
-
List files to be snaped to avoid duplicate files with ubuntu-app-platform
- 610. By Renato Araujo Oliveira Filho
-
QtFeedback is already present on ubuntu-
app-platform.
Remove duplicated entry 'usr/lib/*/libtelepathy- qt5.so. *'
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:609
https:/
Executed test runs:
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:/
Roberto Mier Escandon (rmescandon) wrote : | # |
only 2.7Mb of size here when created the package. LveryGTM
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:610
https:/
Executed test runs:
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:/
Preview Diff
1 | === added directory 'snap' | |||
2 | === added directory 'snap/ubuntu-app-platform' | |||
3 | === modified file 'snapcraft.yaml' | |||
4 | --- snapcraft.yaml 2016-10-12 12:10:08 +0000 | |||
5 | +++ snapcraft.yaml 2016-11-24 12:58:17 +0000 | |||
6 | @@ -8,7 +8,14 @@ | |||
7 | 8 | apps: | 8 | apps: |
8 | 9 | messaging-app: | 9 | messaging-app: |
9 | 10 | command: desktop-launch $SNAP/usr/bin/messaging-app --desktop_file_hint=unity8 "$@" | 10 | command: desktop-launch $SNAP/usr/bin/messaging-app --desktop_file_hint=unity8 "$@" |
11 | 11 | plugs: [unity7, opengl] | 11 | plugs: [unity7, opengl, platform, gsettings] |
12 | 12 | |||
13 | 13 | plugs: | ||
14 | 14 | platform: | ||
15 | 15 | interface: content | ||
16 | 16 | content: ubuntu-app-platform1 | ||
17 | 17 | target: ubuntu-app-platform | ||
18 | 18 | default-provider: ubuntu-app-platform | ||
19 | 12 | 19 | ||
20 | 13 | parts: | 20 | parts: |
21 | 14 | messaging-app: | 21 | messaging-app: |
22 | @@ -28,28 +35,54 @@ | |||
23 | 28 | - qtpim5-dev | 35 | - qtpim5-dev |
24 | 29 | 36 | ||
25 | 30 | stage-packages: | 37 | stage-packages: |
32 | 31 | - libqt5multimedia5 | 38 | - qtdeclarative5-ubuntu-addressbook0.1 |
33 | 32 | - qml-module-qt-labs-folderlistmodel | 39 | - qtdeclarative5-ubuntu-history0.1 |
28 | 33 | - qml-module-qt-labs-settings | ||
29 | 34 | - qml-module-ubuntu-components | ||
30 | 35 | - qml-module-qtmultimedia | ||
31 | 36 | - qml-module-ofono | ||
34 | 37 | - qtdeclarative5-ubuntu-telephony-phonenumber0.1 | 40 | - qtdeclarative5-ubuntu-telephony-phonenumber0.1 |
35 | 38 | - qtdeclarative5-ubuntu-history0.1 | ||
36 | 39 | - qtdeclarative5-ubuntu-telephony0.1 | 41 | - qtdeclarative5-ubuntu-telephony0.1 |
37 | 40 | - qtdeclarative5-qtcontacts-plugin | ||
38 | 41 | - ttf-ancient-fonts-symbola | ||
39 | 42 | - qtdeclarative5-gsettings1.0 | ||
40 | 43 | - qtdeclarative5-ubuntu-addressbook0.1 | ||
41 | 44 | - qtdeclarative5-ubuntu-content1 | ||
42 | 45 | - qtdeclarative5-ubuntu-keyboard-extensions0.1 | ||
43 | 46 | - qtubuntu-desktop | ||
44 | 47 | - suru-icon-theme | ||
45 | 48 | - mir-graphics-drivers-desktop | ||
46 | 49 | 42 | ||
47 | 50 | snap: | 43 | snap: |
53 | 51 | - -usr/lib/python3 | 44 | # Messaging ap |
54 | 52 | - -usr/share/doc | 45 | - usr/share/applications/messaging-app*.desktop |
55 | 53 | - -usr/include | 46 | - usr/share/url-dispatcher/urls |
56 | 54 | 47 | - usr/share/content-hub/peers/messaging-app | |
57 | 55 | after: [desktop-qt5] | 48 | - usr/share/locale/*/LC_MESSAGES/messaging-app.mo |
58 | 49 | - usr/share/messaging-app/*.qml | ||
59 | 50 | - usr/share/messaging-app/*.js | ||
60 | 51 | - usr/share/messaging-app/assets | ||
61 | 52 | - usr/share/messaging-app/3rd_party | ||
62 | 53 | - usr/share/messaging-app/MMS/*.qml | ||
63 | 54 | - usr/share/messaging-app/Dialogs/*.qml | ||
64 | 55 | - usr/share/messaging-app/Stickers/*.qml | ||
65 | 56 | - usr/bin/*messaging-app* | ||
66 | 57 | |||
67 | 58 | # Addressbook | ||
68 | 59 | - usr/lib/*/qt5/qml/Ubuntu/Contacts.0.1/ | ||
69 | 60 | - usr/share/doc/qtdeclarative5-ubuntu-contacts0.1/copyright | ||
70 | 61 | - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ | ||
71 | 62 | - usr/share/doc/qtdeclarative5-ubuntu-addressbook0.1/copyright | ||
72 | 63 | |||
73 | 64 | # History | ||
74 | 65 | - usr/share/doc/qtdeclarative5-ubuntu-history0.1/copyright | ||
75 | 66 | - usr/lib/*/qt5/qml/Ubuntu/History/libhistory-qml.so | ||
76 | 67 | - usr/lib/*/qt5/qml/Ubuntu/History/qmldir | ||
77 | 68 | - usr/lib/*/libhistoryservice.so.* | ||
78 | 69 | - usr/lib/*/libtelepathy-qt5.so.* | ||
79 | 70 | |||
80 | 71 | #PhoneNumber | ||
81 | 72 | - usr/share/doc/qtdeclarative5-ubuntu-telephony-phonenumber0.1/copyright | ||
82 | 73 | - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberField.qml | ||
83 | 74 | - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/libtelephonyservice-phonenumber-qml.so | ||
84 | 75 | - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumber.js | ||
85 | 76 | - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberInput.qml | ||
86 | 77 | - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/qmldir | ||
87 | 78 | - usr/lib/*/libphonenumber.so.7* | ||
88 | 79 | |||
89 | 80 | #Telephony | ||
90 | 81 | - usr/lib/*/qt5/qml/Ubuntu/Telephony/ | ||
91 | 82 | - usr/share/doc/qtdeclarative5-ubuntu-telephony0.1/copyright | ||
92 | 83 | |||
93 | 84 | after: [desktop-ubuntu-app-platform] | ||
94 | 85 | |||
95 | 86 | environment: | ||
96 | 87 | source: snap/ | ||
97 | 88 | plugin: dump |
PASSED: Continuous integration, rev:606 /jenkins. canonical. com/system- apps/job/ lp-messaging- app-ci/ 158/ /jenkins. canonical. com/system- apps/job/ build/2043 /jenkins. canonical. com/system- apps/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= default/ 497 /jenkins. canonical. com/system- apps/job/ build-0- fetch/2046 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1876/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1876/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1876/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
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: /jenkins. canonical. com/system- apps/job/ lp-messaging- app-ci/ 158/rebuild
https:/