diff --git a/build__common.sh b/build__common.sh index 77792dd..3fa30c8 100644 --- a/build__common.sh +++ b/build__common.sh @@ -11,17 +11,27 @@ common_start() { deployment="${1:-${deployment:-}}" action="${action:-deploy}" persistence="${persistence:-y}" + idhub_branch="${idhub_branch:-main}" # detach on production deployment if [ "${deployment}" = 'prod' ]; then detach='-d' fi + # TODO at some point it would be better to use pull-repos.sh # ensure uses main branch branch and that it is up to date ( cd ./IdHub if [ -d .git ]; then - git checkout main + git checkout ${idhub_branch} + git pull + fi + ) + + ( + cd ./ssikit_trustchain + if [ -d .git ]; then + git checkout master git pull fi ) diff --git a/build__instance-autotest.sh b/build__instance-autotest.sh index 283866a..9c4b692 100755 --- a/build__instance-autotest.sh +++ b/build__instance-autotest.sh @@ -17,6 +17,7 @@ main() { target='instance-autotest' persistence='n' idhubs='idhub' + idhub_branch='release' common_start diff --git a/build__instance-nightly.sh b/build__instance-nightly.sh index 0fc72d6..c4de6dd 100755 --- a/build__instance-nightly.sh +++ b/build__instance-nightly.sh @@ -17,6 +17,7 @@ main() { target='instance-nightly' persistence='n' idhubs='idhub' + idhub_branch='release' common_start