content-hub

Merge lp:~ken-vandine/content-hub/snapcraft into lp:content-hub

  1. snapcraft
  2. Merge into trunk
Proposed by Ken VanDine
Status: Needs review
Proposed branch: lp:~ken-vandine/content-hub/snapcraft
Merge into: lp:content-hub
Diff against target: 121 lines (+99/-0)
2 files modified
snapcraft.yaml (+94/-0)
src/com/ubuntu/content/utils.cpp (+5/-0)
To merge this branch: bzr merge lp:~ken-vandine/content-hub/snapcraft
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+308726@code.launchpad.net

Commit message

Added snapcraft.yaml

Description of the change

Added snapcraft.yaml

To post a comment you must log in.
lp:~ken-vandine/content-hub/snapcraft updated
304. By Ken VanDine

plugs not slots

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:303
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/59/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1863/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1864
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1704
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1704/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1704/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1704/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1704
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1704/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1704
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1704/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1704
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1704/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1704
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1704/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1704/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1704/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/59/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:304
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/60/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1864/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1865
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1705
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1705/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1705/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1705/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1705
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1705/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1705
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1705/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1705
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1705/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1705
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1705/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1705/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1705
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1705/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/60/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~ken-vandine/content-hub/snapcraft updated
305. By Ken VanDine

Removed more unwanted files

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:305
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/61/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1865/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1866
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1706
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1706/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1706/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1706
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1706
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1706
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1706
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1706
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1706/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1706/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1706/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/61/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~ken-vandine/content-hub/snapcraft updated
306. By Ken VanDine

merged systemd unit file branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:306
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/67/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1892/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1893
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1733
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1733/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1733/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1733/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1733
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1733/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1733
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1733/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1733
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1733/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1733
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1733/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1733/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1733/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/67/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~ken-vandine/content-hub/snapcraft updated
307. By Ken VanDine

merged trunk

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:307
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/2/
Executed test runs:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/2/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~ken-vandine/content-hub/snapcraft updated
308. By Ken VanDine

Don't attempt to build appinfo when CONTENT_HUB_TESTING is set

309. By Ken VanDine

snapcraft improvements

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:309
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2310/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2309
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2131/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2131/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2131
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2131/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2131
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2131/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2131/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2131/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/6/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

309. By Ken VanDine

snapcraft improvements

308. By Ken VanDine

Don't attempt to build appinfo when CONTENT_HUB_TESTING is set

307. By Ken VanDine

merged trunk

306. By Ken VanDine

merged systemd unit file branch

305. By Ken VanDine

Removed more unwanted files

304. By Ken VanDine

plugs not slots

303. By Ken VanDine

added slots to snap

302. By Ken VanDine

Don't include headers and testability peers in the snap

301. By Ken VanDine

basic snapcraft.yaml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'snapcraft.yaml'
2--- snapcraft.yaml 1970-01-01 00:00:00 +0000
3+++ snapcraft.yaml 2017-03-06 15:22:56 +0000
4@@ -0,0 +1,94 @@
5+name: content-hub
6+version: 0.2
7+summary: content sharing/picking service
8+description: |
9+ Content sharing/picking infrastructure and service, designed to allow apps to
10+ securely and efficiently exchange content.
11+ Please find the source code at:
12+ https://code.launchpad.net/content-hub
13+confinement: strict
14+
15+apps:
16+ content-hub:
17+ command: desktop-launch content-hub-service
18+ slots: [content-transfer]
19+ plugs: [gsettings, dbus]
20+
21+plugs:
22+ dbus:
23+ name: com.ubuntu.content.dbus.Service
24+ bus: session
25+
26+parts:
27+ content-hub:
28+ plugin: cmake
29+ source: .
30+
31+ build-packages:
32+ - build-essential
33+ - cmake
34+ - dbus-test-runner
35+ - dh-apparmor
36+ - dh-translations
37+ - doxygen
38+ - google-mock
39+ - lcov
40+ - libapparmor-dev
41+ - libglib2.0-dev
42+ - libgsettings-qt-dev
43+ - liblibertine-dev
44+ - libmirclient-dev
45+ - libnih-dbus-dev
46+ - libnotify-dev
47+ - libubuntu-download-manager-client-dev
48+ - libubuntu-app-launch3-dev
49+ - qt5-default
50+ - qtbase5-dev
51+ - qtdeclarative5-dev
52+ - qtdeclarative5-dev-tools
53+ - qtdeclarative5-qtquick2-plugin
54+ - qtdeclarative5-test-plugin
55+ - qtdeclarative5-ubuntu-ui-toolkit-plugin
56+ - qttools5-dev-tools
57+
58+ stage-packages:
59+ - libmirclient9
60+ - libgsettings-qt1
61+ - libglib2.0-bin
62+
63+ configflags:
64+ - -DCMAKE_INSTALL_PREFIX:PATH=/usr
65+ - -DCMAKE_LIBRARY_PATH=/usr/lib
66+
67+ filesets:
68+ unwanted:
69+ # Files that we don't want/need in the final snap package
70+ - -etc
71+ - -usr/bin/content-hub-test*
72+ - -usr/include
73+ - -usr/lib/debug
74+ - -usr/lib/*/libogg*
75+ - -usr/lib/*/libpulse*
76+ - -usr/lib/*/qt5
77+ - -usr/lib/*/pkgconfig
78+ - -usr/lib/python*
79+ - -usr/share/applications
80+ - -usr/share/apport
81+ - -usr/share/bug
82+ - -usr/share/doc
83+ - -usr/share/fonts
84+ - -usr/share/libwacom
85+ - -usr/share/lintian
86+ - -usr/share/man
87+ - -usr/share/X11
88+ - -usr/lib/*.a
89+ - -usr/lib/*/*.a
90+ - -usr/lib/*.la
91+ - -usr/lib/*/*.la
92+ - -usr/lib/*/*.o
93+
94+ prime:
95+ - $unwanted
96+
97+ after:
98+ - desktop-ubuntu-app-platform
99
100=== modified file 'src/com/ubuntu/content/utils.cpp'
101--- src/com/ubuntu/content/utils.cpp 2017-01-25 19:57:28 +0000
102+++ src/com/ubuntu/content/utils.cpp 2017-03-06 15:22:56 +0000
103@@ -237,6 +237,7 @@
104
105 QMap<QString, QString> info_for_app_id(QString id)
106 {
107+ TRACE() << Q_FUNC_INFO << id;
108 QMap<QString, QString> map;
109 map["name"] = id;
110 map["iconPath"] = QString();
111@@ -386,6 +387,10 @@
112 {
113 TRACE() << Q_FUNC_INFO << "PROFILE:" << profile;
114
115+ /* Don't verify app_id while testing */
116+ if (!qgetenv("CONTENT_HUB_TESTING").isNull())
117+ return true;
118+
119 int allowed;
120 if (query_file(profile.toStdString().c_str(), path.toStdString().c_str(), &allowed) == -1) {
121 qWarning() << "error:" << strerror(errno) << path;

Subscribers

People subscribed via source and target branches