From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 8 Nov 2016 03:55:48 +0000 (+0800)
Subject: Revert "Merge branch 'feature/ci_checkout_same_branch_for_submodule' into 'master'"
X-Git-Tag: v1.0~73^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d12078b6926dcb72a5f31e6a0e43cf2f036b04e0;p=esp-idf

Revert "Merge branch 'feature/ci_checkout_same_branch_for_submodule' into 'master'"

This reverts merge request !178
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f65fdfc00..1e09b55c44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,14 +13,12 @@ before_script:
   - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
   - chmod 600 ~/.ssh/id_rsa
   - echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+
   # if testing master branch, use github wifi libs.
   # if testing other branches, use gitlab wifi libs (as maybe changes aren't merged to master yet)
   - test "${CI_BUILD_REF_NAME}" = "master" || sed -i "s%https://github.com/espressif/esp32-wifi-lib%ssh://git@gitlab.espressif.cn:27227/idf/esp32-wifi-lib%" .gitmodules
   # fetch all submodules
   - git submodule update --init --recursive
-  # try use submodule with same branch
-  - SUBMODULES=`cat .gitmodules | grep path | awk '{print $3}'`
-  - for MODULE in $SUBMODULES;do (echo $MODULE;cd $MODULE;git checkout ${CI_BUILD_REF_NAME} || echo "using default branch";cd $CI_PROJECT_DIR); done
 
 build_template_app:
   stage: build