Skip to content

Commit 41f53dc

Browse files
Merge branch 'rclonetest' into 'master'
Fix: configure RCLONE_CONFIG and upload to s3 See merge request idf/idf-eclipse-plugin!135
2 parents c2f7901 + fa7f193 commit 41f53dc

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

.gitlab-ci.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ build:
6161

6262
.upload_template: &upload_template
6363
when: manual
64+
image:
65+
name: rclone/rclone:1
66+
entrypoint: [""]
6467
tags:
6568
- deploy
6669
dependencies:
@@ -72,18 +75,21 @@ build:
7275
# upload archive
7376
- cit_add_ssh_key "${SRV_KEY}"
7477
- cd ${ARCHIVE_DIR}
75-
- scp ${ARCHIVE_NAME} ${SRV_UPLOAD_PATH}
78+
- rclone --config=$RCLONE_CONFIG copy ${ARCHIVE_NAME} ${SRV_UPLOAD_PATH}
7679
# upload directory
7780
- UNIQ_DIR=${UNIQ_SUFFIX}
7881
- mkdir ${UNIQ_DIR} && cd ${UNIQ_DIR} && unzip -q ../${ARCHIVE_NAME} && cd ..
79-
- scp -r ${UNIQ_DIR} ${SRV_UPLOAD_PATH}
82+
- rclone --config=$RCLONE_CONFIG copy ${UNIQ_DIR} ${SRV_UPLOAD_PATH}
8083
- ssh ${SRV_SERVER_SSH} "cd ${SRV_DIR} && ln -srnf ${UNIQ_DIR} ${SRV_LATEST_NAME}"
8184
# Show info
8285
- echo -e "\nAn archives was published there:\n\n${SRV_HTTP_URL}/${ARCHIVE_NAME}"
8386
- echo -e "\n\n\nThe plugin was published there:\n\n${SRV_HTTP_URL}/${SRV_LATEST_NAME}"
8487

8588
.upload_ide: &upload_ide
8689
when: manual
90+
image:
91+
name: rclone/rclone:1
92+
entrypoint: [""]
8793
tags:
8894
- deploy
8995
dependencies:
@@ -96,9 +102,9 @@ build:
96102
- LINUX_IDE_PATH= ${PRODUCTS_PATH}/Espressif-IDE-*-linux.gtk.x86_64.tar.gz
97103
# upload archive
98104
- cit_add_ssh_key "${SRV_KEY}"
99-
- scp ${WIN32_IDE_PATH} ${SRV_UPLOAD_PATH}
100-
- scp ${MACOSX_IDE_PATH} ${SRV_UPLOAD_PATH}
101-
- scp ${LINUX_IDE_PATH} ${SRV_UPLOAD_PATH}
105+
- rclone --config=$RCLONE_CONFIG copy ${WIN32_IDE_PATH} ${SRV_UPLOAD_PATH}
106+
- rclone --config=$RCLONE_CONFIG copy ${MACOSX_IDE_PATH} ${SRV_UPLOAD_PATH}
107+
- rclone --config=$RCLONE_CONFIG copy ${LINUX_IDE_PATH} ${SRV_UPLOAD_PATH}
102108
# Show info
103109
- echo -e "\nAn win32 Espressif-IDE was published there:\n\n${SRV_HTTP_URL}/${WIN32_IDE_PATH}"
104110
- echo -e "\nAn macosx Espressif-IDE was published there:\n\n${SRV_HTTP_URL}/${MACOSX_IDE_PATH}"

0 commit comments

Comments
 (0)