alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_submodule_paths_v3.0' into 'release/v3.0'

Browse Source 
CI - Fix the parsing of submodule paths  (backport v3.0)

See merge request idf/esp-idf!4571
This commit is contained in:
Jiang Jiang Jian 2019-04-04 17:58:49 +08:00
commit 8cc4f17ddf
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -18,7 +18,7 @@ variables:
GET_SOURCES_ATTEMPTS: "10" GET_SOURCES_ATTEMPTS: "10"
ARTIFACT_DOWNLOAD_ATTEMPTS: "10" ARTIFACT_DOWNLOAD_ATTEMPTS: "10"
# We use get_sources.sh script to fetch the submodules and/or re-fetch the repo # We use get-full-sources.sh script to fetch the submodules and/or re-fetch the repo
# if it was corrupted (if submodule update fails this can happen) # if it was corrupted (if submodule update fails this can happen)
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
GIT_SUBMODULE_STRATEGY: none GIT_SUBMODULE_STRATEGY: none

14
tools/ci/mirror-submodule-update.sh
View File

@ -54,13 +54,15 @@ git submodule init
# 2 # 2
# Replacing each submodule URL of the current repository # Replacing each submodule URL of the current repository
# according to the one found in the MIRRORLIST # according to the one found in the MIRRORLIST
# SED parses the strings like:
# #
#-b991c67c1d91574ef22336cc3a5944d1e63230c9 roms/ipxe # Selecting paths among lines:
#b991c67c1d91574ef22336cc3a5944d1e63230c9 roms/ipxe (v1.0.0-2388-gb991c67) # ...
# #submodule.components/esp32/lib.path
for SUBPATH in $(git submodule status | sed -E 's/.*[[:space:]](.*)([[:space:]].*|$)/\1/') #submodule.components/esp32/lib.url
#submodule.components/esptool_py/esptool.path
#submodule.components/esptool_py/esptool.url
#...
for SUBPATH in $(git config -f .gitmodules --list --name-only | grep "\.path" | sed 's/^submodule\.\([^ ]*\)\.path$/\1/')
do do
SUBMIRROR=$(join -o"2.2" <(echo ${SUBPATH}) <(sort ${MIRRORLIST})) SUBMIRROR=$(join -o"2.2" <(echo ${SUBPATH}) <(sort ${MIRRORLIST}))
[ ${SUBMIRROR} ] || continue [ ${SUBMIRROR} ] || continue