Ubuntu Push Notifications

Merge lp:~jonas-drange/ubuntu-push/replace-dead-deps into lp:ubuntu-push

  1. replace-dead-deps
  2. Merge into trunk
Proposed by Jonas G. Drange on 2016-07-26
Status: Superseded
Proposed branch: lp:~jonas-drange/ubuntu-push/replace-dead-deps
Merge into: lp:ubuntu-push
Diff against target: 43 lines (+11/-6)
2 files modified
Makefile (+10/-3)
dependencies.tsv (+1/-3)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/replace-dead-deps
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-07-29
Ubuntu Push Hackers 2016-07-26 Pending
Review via email: mp+301195@code.launchpad.net

Commit Message

re-enable the developer environment by replacing dead upstream dependencies with new ones, but keep the namespace intact.

Description of the Change

Get the development environment working again. This is a temporary hack, the plan is to replace those dependencies, but we're blocked until lp:1606618 and lp:1606626 are solved.

Note: I've looked over the new upstream deps, but that's not much of a security audit. However, a package will never be built off of these github deps as packages are built off of golang packages in the archive.

To post a comment you must log in.
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:169
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-push/replace-dead-deps/+merge/301195/+edit-commit-message

https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1040/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1040
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/937/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/937/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/937/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/17/rebuild

review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-push/replace-dead-deps updated on 2016-07-29
170. By Jonas G. Drange on 2016-07-29

nuke the changelog entry

system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-push/replace-dead-deps updated on 2016-08-10
171. By Jonas G. Drange on 2016-08-10

merge prereq

Unmerged revisions

171. By Jonas G. Drange on 2016-08-10

merge prereq

170. By Jonas G. Drange on 2016-07-29

nuke the changelog entry

169. By Jonas G. Drange on 2016-07-26

hack upstream deps for now

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-03-09 16:12:39 +0000
3+++ Makefile 2016-07-29 14:17:29 +0000
4@@ -10,8 +10,9 @@
5 GODEPS = launchpad.net/gocheck
6 GODEPS += launchpad.net/go-dbus/v1
7 GODEPS += launchpad.net/go-xdg/v0
8-GODEPS += code.google.com/p/gosqlite/sqlite3
9-GODEPS += code.google.com/p/go-uuid/uuid
10+
11+GODEPS += github.com/rothgar/gosqlite/sqlite3
12+GODEPS += github.com/pborman/uuid
13
14 # cgocheck=0 is a workaround for lp:1555198
15 GOTEST := GODEBUG=cgocheck=0 ./scripts/goctest
16@@ -34,9 +35,15 @@
17 $(RM) -r $(GOPATH)/pkg
18 mkdir -p $(GOPATH)/bin
19 mkdir -p $(GOPATH)/pkg
20- go get -u launchpad.net/godeps
21+ go get -u github.com/rogpeppe/godeps
22 go get -d -u $(GODEPS)
23 $(GOPATH)/bin/godeps -u dependencies.tsv
24+
25+ # Workaround for lp:1606618 and lp:1606626
26+ mkdir -p $(GOPATH)/src/code.google.com/p/go-uuid/
27+ ln -s $(GOPATH)/src/github.com/rothgar/gosqlite $(GOPATH)/src/code.google.com/p/gosqlite
28+ ln -s $(GOPATH)/src/github.com/pborman/uuid $(GOPATH)/src/code.google.com/p/go-uuid/uuid
29+
30 go install $(GODEPS)
31
32 dependencies.tsv:
33
34=== modified file 'dependencies.tsv'
35--- dependencies.tsv 2015-11-20 15:03:47 +0000
36+++ dependencies.tsv 2016-07-29 14:17:29 +0000
37@@ -1,5 +1,3 @@
38-code.google.com/p/go-uuid hg 7dda39b2e7d5e265014674c5af696ba4186679e9 11
39-code.google.com/p/gosqlite hg 74691fb6f83716190870cde1b658538dd4b18eb0 15
40-launchpad.net/go-dbus/v1 bzr jlenton@gmail.com-20141023032446-s5icvsucwlv5o38a 129
41+launchpad.net/go-dbus/v1 bzr jlenton@gmail.com-20150203130125-kqqbam1jsp3tmlk5 136
42 launchpad.net/go-xdg/v0 bzr john.lenton@canonical.com-20140208094800-gubd5md7cro3mtxa 10
43 launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87

Subscribers

People subscribed via source and target branches