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

Merge branch 'bugfix/fix_ci_release_branch' into 'master'

Browse Source 
bugfix(ci): fix branch conflict with idf

See merge request sdk/ESP8266_RTOS_SDK!388
This commit is contained in:
Wu Jian Gang
2018-08-10 20:32:54 +08:00
parent 4990822d5f d874ca2951
commit fd63b5e561
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -42,7 +42,7 @@ build_ssc:
- 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
- git checkout ${CI_BUILD_REF_NAME} || echo "Using default branch..." - git checkout "${CI_BUILD_REF_NAME}_8266" || echo "Using default branch..."
- ./gen_misc_rtos.sh - ./gen_misc_rtos.sh
push_master_to_github: push_master_to_github: