mirror of
https://github.com/YunoHost/yunohost-ci.git
synced 2024-09-03 20:05:53 +02:00
Fix link to moulinette and ssowat
This commit is contained in:
parent
e6708f5012
commit
f94f29b2d4
1 changed files with 14 additions and 6 deletions
20
run.sh
20
run.sh
|
@ -16,9 +16,13 @@ link_moulinette_from_git() {
|
||||||
moulinette_dir="/tmp/ci_moulinette"
|
moulinette_dir="/tmp/ci_moulinette"
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "mkdir $moulinette_dir"
|
lxc exec "$CONTAINER_ID" -- sh -c "mkdir $moulinette_dir"
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "git clone https://github.com/YunoHost/moulinette $moulinette_dir"
|
lxc exec "$CONTAINER_ID" -- sh -c "git clone https://github.com/YunoHost/moulinette $moulinette_dir"
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "pushd $moulinette_dir"
|
lxc exec "$CONTAINER_ID" -- sh -c "(cd $moulinette_dir; \
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "if git ls-remote --heads | grep -q $CURRENT_BRANCH; then git checkout $CURRENT_BRANCH; else git checkout $DEFAULT_BRANCH; fi"
|
if git ls-remote --heads | grep -q $CURRENT_BRANCH; \
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "popd"
|
then \
|
||||||
|
git checkout $CURRENT_BRANCH; \
|
||||||
|
else \
|
||||||
|
git checkout $DEFAULT_BRANCH; \
|
||||||
|
fi)"
|
||||||
|
|
||||||
create_sym_link "$moulinette_dir/locales" "/usr/share/moulinette/locale"
|
create_sym_link "$moulinette_dir/locales" "/usr/share/moulinette/locale"
|
||||||
create_sym_link "$moulinette_dir/moulinette" "/usr/lib/python2.7/dist-packages/moulinette"
|
create_sym_link "$moulinette_dir/moulinette" "/usr/lib/python2.7/dist-packages/moulinette"
|
||||||
|
@ -28,9 +32,13 @@ link_ssowat_from_git() {
|
||||||
ssowat_dir="/tmp/ci_ssowat"
|
ssowat_dir="/tmp/ci_ssowat"
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "mkdir $ssowat_dir"
|
lxc exec "$CONTAINER_ID" -- sh -c "mkdir $ssowat_dir"
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "git clone https://github.com/YunoHost/ssowat $ssowat_dir"
|
lxc exec "$CONTAINER_ID" -- sh -c "git clone https://github.com/YunoHost/ssowat $ssowat_dir"
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "pushd $ssowat_dir"
|
lxc exec "$CONTAINER_ID" -- sh -c "(cd $ssowat_dir; \
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "if git ls-remote --heads | grep -q $CURRENT_BRANCH; then git checkout $CURRENT_BRANCH; else git checkout $DEFAULT_BRANCH; fi"
|
if git ls-remote --heads | grep -q $CURRENT_BRANCH; \
|
||||||
lxc exec "$CONTAINER_ID" -- sh -c "popd"
|
then \
|
||||||
|
git checkout $CURRENT_BRANCH; \
|
||||||
|
else \
|
||||||
|
git checkout $DEFAULT_BRANCH; \
|
||||||
|
fi)"
|
||||||
|
|
||||||
create_sym_link "$ssowat_dir" "/usr/share/ssowat"
|
create_sym_link "$ssowat_dir" "/usr/share/ssowat"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue