| Message ID | 20250424122815.884740-1-ines.kchelfi@smile.fr |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] CI: Remove useless "upstream" check | expand |
Le jeudi 24 avril 2025, <ines.kchelfi@smile.fr> a écrit : > From: Yoann CONGAL <yoann.congal@smile.fr> > > --- > repos_list.sh | 6 ------ > 1 file changed, 6 deletions(-) This is for an internal repo and should not have been sent. Please ignore. > > diff --git a/repos_list.sh b/repos_list.sh > index 03c1f49..0f6eb78 100644 > --- a/repos_list.sh > +++ b/repos_list.sh > @@ -130,12 +130,6 @@ update_layers_to_mr(){ > if [ "${mr_project}" == "${repos_smile_git_sub_project[${layer_i}]}" ] ; then > local_layer_path="$(get_layer_path "${layer_i}" "${cooker_menu}")" > switch_to_mr_ref "${local_layer_path}" "${mr_ref}" > - ## control MR_REF is upstream to MR target > - is_mr_base_parent="$(git -C "${git_local_path}" merge-base --is-ancestor origin/"${MR_TARGET_BRANCH}" "${MR_COMMIT_SHA}" ; echo $?)" > - if [ "${is_mr_base_parent}" != 0 ] ; then > - printf "MR is not properly upstream\n" > - exit 2 > - fi > fi > fi > done > -- > 2.43.0 > >
diff --git a/repos_list.sh b/repos_list.sh index 03c1f49..0f6eb78 100644 --- a/repos_list.sh +++ b/repos_list.sh @@ -130,12 +130,6 @@ update_layers_to_mr(){ if [ "${mr_project}" == "${repos_smile_git_sub_project[${layer_i}]}" ] ; then local_layer_path="$(get_layer_path "${layer_i}" "${cooker_menu}")" switch_to_mr_ref "${local_layer_path}" "${mr_ref}" - ## control MR_REF is upstream to MR target - is_mr_base_parent="$(git -C "${git_local_path}" merge-base --is-ancestor origin/"${MR_TARGET_BRANCH}" "${MR_COMMIT_SHA}" ; echo $?)" - if [ "${is_mr_base_parent}" != 0 ] ; then - printf "MR is not properly upstream\n" - exit 2 - fi fi fi done
From: Yoann CONGAL <yoann.congal@smile.fr> --- repos_list.sh | 6 ------ 1 file changed, 6 deletions(-)