Skip to content

Commit fd63b5e

Browse files
committedAug 10, 2018
Merge branch 'bugfix/fix_ci_release_branch' into 'master'
bugfix(ci): fix branch conflict with idf See merge request sdk/ESP8266_RTOS_SDK!388
2 parents 4990822 + d874ca2 commit fd63b5e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ build_ssc:
4242
- git clone $GITLAB_SSH_SERVER/yinling/SSC.git
4343
- cd SSC
4444
# try checkout same branch
45-
- git checkout ${CI_BUILD_REF_NAME} || echo "Using default branch..."
45+
- git checkout "${CI_BUILD_REF_NAME}_8266" || echo "Using default branch..."
4646
- ./gen_misc_rtos.sh
4747

4848
push_master_to_github:

0 commit comments

Comments
 (0)
Please sign in to comment.