From bbf2e86c06ad38a1a42f3fce9dcf9b848368815b Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 26 Feb 2021 15:16:55 +0800 Subject: [PATCH] fix(ci): check_submodule_sync now will not block ci run --- .gitlab/ci/deploy.yml | 21 +++++++++++++++++++++ .gitlab/ci/pre_check.yml | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 7a89a196b3..f73b43064b 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -52,3 +52,24 @@ deploy_test_result: - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE} # update test results - python3 ImportTestResult.py -r "$GIT_SHA (r${REV_COUNT})" -j $JIRA_TEST_MANAGEMENT_PROJECT -s "$SUMMARY" -l CI -p ${CI_PROJECT_DIR}/TEST_LOGS ${CI_PROJECT_DIR}/${CI_COMMIT_SHA} --pipeline_url ${CI_PIPELINE_URL} + +check_submodule_sync: + extends: + - .deploy_job_template + - .rules:test:submodule + tags: + - github_sync + retry: 2 + variables: + GIT_STRATEGY: clone + SUBMODULES_TO_FETCH: "none" + PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git" + script: + - git submodule deinit --force . + # setting the default remote URL to the public one, to resolve relative location URLs + - git config remote.origin.url ${PUBLIC_IDF_URL} + # check if all submodules are correctly synced to public repository + - git submodule init + - git config --get-regexp '^submodule\..*\.url$' || true + - git submodule update --recursive + - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely" diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml index eea0b105bb..f02492dcda 100644 --- a/.gitlab/ci/pre_check.yml +++ b/.gitlab/ci/pre_check.yml @@ -162,24 +162,3 @@ check_tools_file_patterns: script: - python tools/ci/check_tools_files_patterns.py allow_failure: true - -check_submodule_sync: - extends: - - .pre_check_job_template - - .rules:test:submodule - tags: - - github_sync - retry: 2 - variables: - GIT_STRATEGY: clone - SUBMODULES_TO_FETCH: "none" - PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git" - script: - - git submodule deinit --force . - # setting the default remote URL to the public one, to resolve relative location URLs - - git config remote.origin.url ${PUBLIC_IDF_URL} - # check if all submodules are correctly synced to public repository - - git submodule init - - git config --get-regexp '^submodule\..*\.url$' || true - - git submodule update --recursive - - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"