summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-02-09 18:09:33 +0100
committerRuben Pollan <meskio@sindominio.net>2017-02-09 18:09:33 +0100
commit546190e59ba11fe109d933f4f22fed5398f86010 (patch)
treeb6f69f8be8ae4e02e563d279bf7384412d166cc2
parenta6b01b2df33e6d42faecbbea774ac97b3fc4491b (diff)
[bug] soledad now uses master branch instead of develop
-rw-r--r--Makefile8
-rwxr-xr-xpkg/tools/checkout_leap.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 0055225..3b285a5 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 cdcb90e..1ad1de0 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