Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/pushToAdb into lp:ubuntu-ui-toolkit/staging

  1. pushToAdb
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 1397
Merged at revision: 1400
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/pushToAdb
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 21 lines (+5/-1)
1 file modified
push_to_phone.sh (+5/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/pushToAdb
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+248737@code.launchpad.net

Commit message

Ensure adb is running (and fallback arch if dpkg-dev is missing)

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote :

makes sense

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

PASSED: Continuous integration, rev:1397
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1417/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1049
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1187
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17800

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1417/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'push_to_phone.sh'
2--- push_to_phone.sh 2015-01-28 17:02:34 +0000
3+++ push_to_phone.sh 2015-02-05 12:13:21 +0000
4@@ -16,12 +16,16 @@
5 #
6 # Author: Christian Dywan <christian.dywan@canonical.com>
7
8+# Ensure adb is running to prevent errors in output
9+adb start-server
10+
11 # Determine device architecture
12-ARCH=$(adb shell "dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null" | tr -d \\r)
13+ARCH=$(adb shell "dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || echo arm-linux-gnueabihf" | tr -d \\r)
14 if [ -z "$ARCH" ]; then
15 echo Developer mode enabled? Screen unlocked?
16 exit 1
17 fi
18+echo Ready to push Ubuntu.Components for $ARCH to device
19
20 DEST=/usr/lib/$ARCH/qt5/qml/Ubuntu/Components
21 RUN=$XDG_RUNTIME_DIR/$(basename $0)

Subscribers

People subscribed via source and target branches