From 546190e59ba11fe109d933f4f22fed5398f86010 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Thu, 9 Feb 2017 18:09:33 +0100 Subject: [bug] soledad now uses master branch instead of develop --- Makefile | 8 ++++---- pkg/tools/checkout_leap.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 00552257..3b285a52 100644 --- a/Makefile +++ b/Makefile @@ -15,16 +15,16 @@ dev-backend: dev-latest-backend: dev-backend pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common' - pip install -e 'git+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.common&subdirectory=common' - pip install -e 'git+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.client&subdirectory=client' + pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.common&subdirectory=common' + pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client' dev-all: pip install -e '.[all]' dev-latest-all: dev-all pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common' - pip install -e 'git+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.common&subdirectory=common' - pip install -e 'git+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.client&subdirectory=client' + pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.common&subdirectory=common' + pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client' uninstall: pip uninstall leap.bitmask diff --git a/pkg/tools/checkout_leap.sh b/pkg/tools/checkout_leap.sh index cdcb90e9..1ad1de0a 100755 --- a/pkg/tools/checkout_leap.sh +++ b/pkg/tools/checkout_leap.sh @@ -6,4 +6,4 @@ if [ ! -d "../soledaddev" ]; then git clone https://github.com/leapcode/soledad ../soledaddev fi cd ../leap_commondev && git checkout master && git pull origin master -cd ../soledaddev && git checkout develop && git pull origin develop +cd ../soledaddev && git checkout master && git pull origin master -- cgit v1.2.3