Skip to content

Commit 98cd77d

Browse files
committed
Merge branch 'ci/use_ssc_branch_for_nonos' into 'master'
CI: use release/esp8266_nonos_sdk as default SSC branch See merge request sdk/ESP8266_NONOS_SDK!257
2 parents 3783b9d + e8b5b60 commit 98cd77d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ stages:
1010

1111
variables:
1212
GIT_STRATEGY: clone
13+
SSC_DEFAULT_BRANCH: release/esp8266_nonos_sdk
1314

1415
before_script:
1516
- mkdir -p ~/.ssh
@@ -30,7 +31,7 @@ build_ssc:
3031
- git clone $GITLAB_SSH_SERVER/yinling/SSC.git
3132
- cd SSC
3233
# try checkout same branch
33-
- git checkout ${CI_BUILD_REF_NAME} || echo "Using default branch..."
34+
- git checkout ${CI_BUILD_REF_NAME} || git checkout ${SSC_DEFAULT_BRANCH}
3435
- chmod +x gen_misc_non_os.sh
3536
- ./gen_misc_non_os.sh
3637

0 commit comments

Comments
 (0)