From bfd0856a848543f3f61a635f279986dd626b5d76 Mon Sep 17 00:00:00 2001 From: Avior Date: Tue, 17 Mar 2020 14:45:08 +0100 Subject: [PATCH] Marged some commits Signed-off-by: Avior --- .drone.yml | 31 +++++++-------- db | 2 +- package.json | 3 +- upload.js | 37 ++++++++++++++++++ upload.sh | 6 --- yarn.lock | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 156 insertions(+), 27 deletions(-) create mode 100644 upload.js delete mode 100755 upload.sh diff --git a/.drone.yml b/.drone.yml index a3617a7..c2d0270 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,50 +3,47 @@ name: default type: docker steps: - - name: submodules + - name: Submodules image: alpine/git commands: - git submodule update --init --recursive - git submodule foreach git checkout master - git submodule foreach git pull origin master - - name: prepare + - name: Prepare image: node:alpine commands: - apk -q add yarn - yarn - # - yarn db:compile + - yarn db:compile - - name: compile + - name: Compile image: node:alpine commands: - apk -q add yarn - # - yarn gen:all + - yarn gen:all + - CARDLANG=fr yarn gen:all - - name: push + - name: Push image: alpine/git commands: - cd dist - git config --global user.email "$PUSH_EMAIL" - git config --global user.name "$PUSH_NAME" - # - git add . - # - git commit -m "Updated API" - # - git push -u origin master + - git add . + - git commit -m "Updated API" + - git push -u origin master environment: PUSH_EMAIL: from_secret: PUSH_EMAIL PUSH_NAME: from_secret: PUSH_NAME - - name: upload - image: alpine + + - name: Upload + image: node:alpine commands: - - apk -q add openssh-client sshpass - - mkdir -p ~/.ssh/ - - echo $KNOWN_HOST > ~/.ssh/known_host - - ./upload.sh + - node upload.js environment: - KNOWN_HOST: - from_secret: KNOWN_HOST UPLOAD_USERNAME: from_secret: UPLOAD_USERNAME UPLOAD_PASSWORD: diff --git a/db b/db index a44b94c..9f61871 160000 --- a/db +++ b/db @@ -1 +1 @@ -Subproject commit a44b94c8543de57e0672a9f0f5d5b4783f37cca9 +Subproject commit 9f61871fe96e476831cb34ac0298eca580fcc23f diff --git a/package.json b/package.json index 18063a1..10af380 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ }, "dependencies": { "@tcgdex/sdk": "next", - "glob": "^7.1.6" + "glob": "^7.1.6", + "ssh2-sftp-client": "^5.1.1" }, "devDependencies": { "@types/glob": "^7.1.1", diff --git a/upload.js b/upload.js new file mode 100644 index 0000000..7f23f52 --- /dev/null +++ b/upload.js @@ -0,0 +1,37 @@ +'use strict'; + +// Example of using the uploadDir() method to upload a directory +// to a remote SFTP server + +const path = require('path'); +const SftpClient = require('ssh2-sftp-client'); + +const config = { + host: process.env.UPLOAD_REMOTE, + username: process.env.UPLOAD_USERNAME, + password: process.env.UPLOAD_PASSWORD , + port: 22 +}; + +async function main() { + const client = new SftpClient(); + const src = path.join(__dirname, 'dist'); + const dst = process.env.UPLOAD_DIST; + + try { + await client.connect(config); + client.on('upload', info => { + console.log(`${info.source} => ${info.destination}`); + }); + let rslt = await client.uploadDir(src, dst); + return rslt; + } finally { + client.end(); + } +} + +main().then(msg => { + console.log(msg); +}).catch(err => { + console.log(`main error: ${err.message}`); +}); diff --git a/upload.sh b/upload.sh deleted file mode 100755 index 533400a..0000000 --- a/upload.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -sshpass -p $UPLOAD_PASSWORD sftp -vvv $UPLOAD_USERNAME@$UPLOAD_REMOTE <