Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_ci_release_branch' into 'master'
Browse files Browse the repository at this point in the history
bugfix(ci): fix branch conflict with idf

See merge request sdk/ESP8266_RTOS_SDK!388
  • Loading branch information
wujiangang committed Aug 10, 2018
2 parents 4990822 + d874ca2 commit fd63b5e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build_ssc:
- git clone $GITLAB_SSH_SERVER/yinling/SSC.git
- cd SSC
# 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

push_master_to_github:
Expand Down

0 comments on commit fd63b5e

Please sign in to comment.