From a1915f7f8744ba25e9778b5820163c7d1881447c Mon Sep 17 00:00:00 2001 From: Yinling Date: Fri, 23 Dec 2016 15:16:29 +0800 Subject: [PATCH] use gitlab repo for bt lib on non master barnch same as wifi lib, some bt lib might not be pushed to github yet for developping branches replace gitlab server address with variable --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cb63be8c3..065b0512a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,9 +14,10 @@ before_script: - 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 + # if testing master branch, use github wifi and bt libs. + # if testing other branches, use gitlab wifi and bt 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%${GITLAB_SSH_SERVER}/idf/esp32-wifi-lib%" .gitmodules + - test "${CI_BUILD_REF_NAME}" = "master" || sed -i "s%https://github.com/espressif/esp32-bt-lib%${GITLAB_SSH_SERVER}/idf/esp32-bt-lib%" .gitmodules # fetch all submodules - git submodule update --init --recursive