diff --git a/drone/.drone.yml b/drone/.drone.yml index 5a474cf..0897071 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -1,42 +1,3 @@ -kind: pipeline -type: docker -name: Android - -steps: - - name: Deliver - image: override6/tbasket-frontend:latest - workspace: - path: /src/android - environment: - SSH_PRIVATE_KEY: - from_secret: SSH_PRIVATE - SSH_PUBLIC_KEY: - from_secret: SSH_PUBLIC - commands: - - bash drone/deliver.sh android - - bash drone/android-sign.sh - ---- - -kind: pipeline -type: docker -name: Electron - -steps: - - name: Deliver - image: override6/tbasket-frontend:latest - workspace: - path: /src/electron - environment: - SSH_PRIVATE_KEY: - from_secret: SSH_PRIVATE - SSH_PUBLIC_KEY: - from_secret: SSH_PUBLIC - commands: - - bash drone/deliver.sh electron - ---- - kind: pipeline type: docker name: Apache diff --git a/drone/deliver.sh b/drone/deliver.sh index 89e6feb..55aff05 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -33,6 +33,8 @@ case "$TYPE" in ;; "browser") OUT_DIR="platforms/browser/www/" + mkdir -p "$OUT_DIR" + npm install && npm run build -- --outDir "$OUT_DIR" if [ "$DRONE_BRANCH" = "production" ]; then SERV_DIR="public_html/basket" else SERV_DIR="/server/apache/TBasket/" @@ -46,18 +48,10 @@ case "$TYPE" in ;; esac - -#install cordova - - -cordova platform add "$TYPE" || exit 1 -cordova build "$TYPE" $OPTIONS || exit 1 echo "delivering outputs on server" - - echo "making delivery onto '$USER@$IP:$SERV_DIR'" rsync -avz -I \ --rsync-path="mkdir -p \"$SERV_DIR\" && rsync" \ -e "ssh -o StrictHostKeyChecking=no" \ - --delete "$OUT_DIR" "$USER@$IP:/$SERV_DIR" \ No newline at end of file + --delete "$OUT_DIR" "$USER@$IP:/$SERV_DIR"