espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-21 00:56:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(ci): Modify CI env setup

Browse Source
This commit is contained in:
Dong Heng
2020-09-30 17:06:34 +08:00
parent 98d201a161
commit 1af36c57f8
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -25,8 +25,7 @@ before_script:
- *apply_bot_filter - *apply_bot_filter
- echo "Not setting up GitLab key, fetching submodules ..." - echo "Not setting up GitLab key, fetching submodules ..."
- git submodule update --init --recursive - git submodule update --init --recursive
- ./install.sh - tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
- . ./export.sh
- source tools/ci/configure_ci_environment.sh - source tools/ci/configure_ci_environment.sh
.build_template: &build_template .build_template: &build_template
@ -42,8 +41,7 @@ build_ssc:
- ./SSC/ssc_bin - ./SSC/ssc_bin
expire_in: 6 mos expire_in: 6 mos
script: script:
- ./install.sh - tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
- . ./export.sh
- git clone $GITLAB_SSH_SERVER/yinling/SSC.git - git clone $GITLAB_SSH_SERVER/yinling/SSC.git
- cd SSC - cd SSC
# try checkout same branch # try checkout same branch

2
tools/idf_tools.py
View File

@ -796,7 +796,7 @@ def get_python_env_path():
idf_version_str = version_file.read() idf_version_str = version_file.read()
else: else:
idf_version_str = subprocess.check_output(['git', '-C', global_idf_path, 'describe', '--tags'], cwd=global_idf_path, env=os.environ).decode() idf_version_str = subprocess.check_output(['git', '-C', global_idf_path, 'describe', '--tags'], cwd=global_idf_path, env=os.environ).decode()
match = re.match(r'^v([0-9]+\.[0-9]+).*', idf_version_str) match = re.search(r'v([0-9]+\.[0-9]+).*', idf_version_str)
idf_version = match.group(1) idf_version = match.group(1)
idf_python_env_path = os.path.join(global_idf_tools_path, 'python_env', idf_python_env_path = os.path.join(global_idf_tools_path, 'python_env',