Skip to content

Commit a832d87

Browse files
Merge branch 'bugfix/ci_upload' into 'master'
ci: fix up uploading See merge request idf/idf-eclipse-plugin!72
2 parents 11c9619 + 1609366 commit a832d87

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,16 @@ build:
6969

7070
internal_http:
7171
<<: *upload_template
72+
tags:
73+
- deploy
74+
- shanghai
7275
stage: private_deploy
7376
variables:
7477
GIT_STRATEGY: none
7578
SRV_KEY: ${INTRNL_KEY}
7679
SRV_DIR: ${INTRNL_SERVER_CD_DIR}
7780
SRV_SERVER_SSH: ${INTRNL_SERVER_SSH}
78-
SRV_UPLOAD_PATH: ${INTRNL_SERVER_SSH}:${SRV_DIR}
81+
SRV_UPLOAD_PATH: ${INTRNL_SERVER_SSH}:${INTRNL_SERVER_CD_DIR}
7982
SRV_LATEST_NAME: latest
8083
SRV_HTTP_URL: ${INTRNL_SERVER_HTTP}
8184

@@ -87,11 +90,11 @@ public_http:
8790
variables:
8891
GIT_STRATEGY: none
8992
SRV_KEY: ${DL_KEY}
90-
SRV_DIR: "${DL_SERVER_CD_DIR}"
93+
SRV_DIR: ${DL_SERVER_CD_DIR}
9194
SRV_SERVER_SSH: ${DL_SERVER_SSH}
92-
SRV_UPLOAD_PATH: ${DL_SERVER_SSH}:${SRV_DIR}
95+
SRV_UPLOAD_PATH: ${DL_SERVER_SSH}:${DL_SERVER_CD_DIR}
9396
SRV_LATEST_NAME: latest
94-
SRV_HTTP_URL: ${DL_SERVER_HTTP}/${SRV_DIR}
97+
SRV_HTTP_URL: ${DL_SERVER_HTTP}/${DL_SERVER_CD_DIR}
9598

9699
.git_sync_template: &git_sync_template
97100
stage: public_deploy

0 commit comments

Comments
 (0)