Storage Framework

Merge lp:~michihenning/storage-framework/move-provider-soversion into lp:storage-framework/devel

  1. move-provider-soversion
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 43
Merged at revision: 46
Proposed branch: lp:~michihenning/storage-framework/move-provider-soversion
Merge into: lp:storage-framework/devel
Diff against target: 27 lines (+2/-2)
2 files modified
CMakeLists.txt (+1/-1)
debian/bileto_pre_release_hook (+1/-1)
To merge this branch: bzr merge lp:~michihenning/storage-framework/move-provider-soversion
Reviewer Review Type Date Requested Status
James Henstridge Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+302371@code.launchpad.net

Commit message

Moved get-provider-soversion.sh into ./tools.

Description of the change

Moved get-provider-soversion.sh into ./tools.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:41
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/323/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/329
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/256
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/256
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/256
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/185/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/185/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/54/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

This needs a corresponding change in the top level CMakeLists.txt, right?

review: Needs Fixing
lp:~michihenning/storage-framework/move-provider-soversion updated
42. By Michi Henning

Fixed top-level makefile soversion script invocation.

43. By Michi Henning

Merged devel.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:43
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/61/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/345
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/351
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/272
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/272
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/272
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/202
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/202/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/61/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-08-05 10:53:57 +0000
3+++ CMakeLists.txt 2016-08-11 02:06:26 +0000
4@@ -17,7 +17,7 @@
5 # These two should be incremented when the ABI changes.
6 set(SF_CLIENT_SOVERSION "0")
7 execute_process(
8- COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/get-provider-soversion.sh
9+ COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/tools/get-provider-soversion.sh
10 OUTPUT_VARIABLE SF_PROVIDER_SOVERSION
11 OUTPUT_STRIP_TRAILING_WHITESPACE
12 RESULT_VARIABLE result)
13
14=== modified file 'debian/bileto_pre_release_hook'
15--- debian/bileto_pre_release_hook 2016-07-22 04:23:08 +0000
16+++ debian/bileto_pre_release_hook 2016-08-11 02:06:26 +0000
17@@ -2,7 +2,7 @@
18
19 set -eu
20
21-soversion=$(sh ./get-provider-soversion.sh)
22+soversion=$(sh ./tools/get-provider-soversion.sh)
23
24 infile=./debian/control.in
25 outfile=./debian/control
26
27=== renamed file 'get-provider-soversion.sh' => 'tools/get-provider-soversion.sh'

Subscribers

People subscribed via source and target branches

to all changes: