diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh index 974f28eb45b045fcdfd8ce22b2fd07ae331334de..5cac1ba0c4a626761809103e822793ec694068a4 100755 --- a/utils/pull_subtrees.sh +++ b/utils/pull_subtrees.sh @@ -17,7 +17,7 @@ cd .. # Vitis echo "---- Pull vitis ----" -git subtree pull --prefix src/vitis --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master +git subtree pull --prefix src/vitis --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion # Modules if [[ $depsCount > 0 ]]; then @@ -26,7 +26,7 @@ if [[ $depsCount > 0 ]]; then echo "---- Pull ${aDeps[$i, name]} ----" # Ajoute le dépôt - git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master + git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} fi done fi diff --git a/utils/push_subtrees.sh b/utils/push_subtrees.sh index b4949ea2dca1465c2cc0282d59442c158d7138e1..18a9d3bdac1f0d8d3f6af3e16af06d7337ddf9f6 100755 --- a/utils/push_subtrees.sh +++ b/utils/push_subtrees.sh @@ -17,7 +17,11 @@ cd .. # Vitis echo "---- Push vitis ----" -git subtree push --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master +{ # 'try' block + git subtree push --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion +} || { # 'catch' block + echo "could not push vitis" +} # Modules if [[ $depsCount > 0 ]]; then @@ -28,7 +32,7 @@ if [[ $depsCount > 0 ]]; then # Push le dépôt { # 'try' block - git subtree push --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master + git subtree push --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} } || { # 'catch' block echo "could not push ${aDeps[$i, name]}" }