From 51cbd34cce0bb1e1f3efca53f9a62660fb4075da Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 15:38:42 +0100 Subject: [PATCH 1/7] updating drone --- drone/.drone.yml | 2 ++ drone/deliver.sh | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index b9bf09c..fca024a 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -14,6 +14,7 @@ steps: commands: - bash drone/deliver.sh android - bash drone/android-sign.sh + - name: Electron image: override6/tbasket-frontend environment: @@ -21,6 +22,7 @@ steps: from_secret: SSH_PRIVATE SSH_PUBLIC_KEY: from_secret: SSH_PUBLIC + commands: - bash drone/deliver.sh electron - name: Web diff --git a/drone/deliver.sh b/drone/deliver.sh index 662e664..c3fc035 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -34,6 +34,7 @@ case "$TYPE" in "browser") OUT_DIR="platforms/browser/www/*" SERV_DIR="/server/apache/TBasket/" + tree -d || ls ;; "electron") OUT_DIR="platforms/electron/build" @@ -54,4 +55,7 @@ echo "delivering outputs on server" echo "making delivery onto '$USER@$IP:$SERV_DIR'" -scp -o "StrictHostKeyChecking no" -r "$OUT_DIR" "$USER@$IP:$SERV_DIR" \ No newline at end of file +rsync -avz -I \ + --rsync-path="mkdir -p \"$SERV_DIR\" && rsync" \ + -e "ssh -o StrictHostKeyChecking=no" \ + --delete "$OUT_DIR" "$USER@$IP" \ No newline at end of file From c3a7de208d09187bd72d832f990f28581b2a0a3e Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 15:51:49 +0100 Subject: [PATCH 2/7] updating drone --- drone/.drone.yml | 6 +++--- drone/deliver.sh | 1 - drone/image/Dockerfile | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 44b0df0..44bd0dd 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -5,7 +5,7 @@ mode: parallel steps: - name: Android - image: override6/tbasket-frontend + image: override6/tbasket-frontend:latest environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -16,7 +16,7 @@ steps: - bash drone/android-sign.sh - name: Electron - image: override6/tbasket-frontend + image: override6/tbasket-frontend:latest environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -24,7 +24,7 @@ steps: from_secret: SSH_PUBLIC commands: - - bash drone/deliver.sh electron + - bash drone/deliver.sh electron:latest - name: Web image: override6/tbasket-frontend environment: diff --git a/drone/deliver.sh b/drone/deliver.sh index c3fc035..7c2af50 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -34,7 +34,6 @@ case "$TYPE" in "browser") OUT_DIR="platforms/browser/www/*" SERV_DIR="/server/apache/TBasket/" - tree -d || ls ;; "electron") OUT_DIR="platforms/electron/build" diff --git a/drone/image/Dockerfile b/drone/image/Dockerfile index f335d94..c6cf50c 100644 --- a/drone/image/Dockerfile +++ b/drone/image/Dockerfile @@ -1,3 +1,4 @@ FROM alvrme/alpine-android:android-32-jdk11 -RUN (apk update && apk add npm openssh-client tree) &&\ - npm install -g cordova +RUN apk update \ + && apk add npm openssh-client tree rsync \ + && npm install -g cordova From 25fc8968085b94b33b73a54ab48f2f8967081213 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 16:06:20 +0100 Subject: [PATCH 3/7] updating drone --- drone/.drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 44bd0dd..70e290e 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -24,9 +24,9 @@ steps: from_secret: SSH_PUBLIC commands: - - bash drone/deliver.sh electron:latest + - bash drone/deliver.sh electron - name: Web - image: override6/tbasket-frontend + image: override6/tbasket-frontend:latest environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE From 8bed9abdbeff6c0441f8abeac5c6f1973c52d556 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 16:08:19 +0100 Subject: [PATCH 4/7] updating drone --- drone/.drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 70e290e..3b67d4c 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -35,7 +35,7 @@ steps: commands: - bash drone/deliver.sh browser - - name: dummy - image: ubuntu:latest - depends_on: - - "Web" \ No newline at end of file +# - name: dummy + # image: ubuntu:latest + # depends_on: + # - "Web" \ No newline at end of file From fa1a797a7cf20796019805e95412146376382f05 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 16:11:53 +0100 Subject: [PATCH 5/7] updating drone --- drone/.drone.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 3b67d4c..5a0aee3 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -6,6 +6,8 @@ mode: parallel steps: - name: Android image: override6/tbasket-frontend:latest + workspace: + path: /src environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -17,16 +19,20 @@ steps: - name: Electron image: override6/tbasket-frontend:latest + workspace: + path: /src environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE SSH_PUBLIC_KEY: from_secret: SSH_PUBLIC - commands: - bash drone/deliver.sh electron + - name: Web image: override6/tbasket-frontend:latest + workspace: + path: /src environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -35,7 +41,7 @@ steps: commands: - bash drone/deliver.sh browser -# - name: dummy - # image: ubuntu:latest - # depends_on: - # - "Web" \ No newline at end of file + - name: dummy + image: ubuntu:latest + depends_on: + - "Web" \ No newline at end of file From 6946307bca8ddcff8d24a1673fbcf43de36ebcc5 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 16:15:57 +0100 Subject: [PATCH 6/7] updating drone --- drone/.drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 5a0aee3..617218e 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -7,7 +7,7 @@ steps: - name: Android image: override6/tbasket-frontend:latest workspace: - path: /src + path: /src/android environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -20,7 +20,7 @@ steps: - name: Electron image: override6/tbasket-frontend:latest workspace: - path: /src + path: /src/electron environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -32,7 +32,7 @@ steps: - name: Web image: override6/tbasket-frontend:latest workspace: - path: /src + path: /src/web environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE From 25afe88cd5b37d75aa733f8f94e8bd2bd2e4bdee Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 16:21:18 +0100 Subject: [PATCH 7/7] updating drone --- drone/.drone.yml | 28 ++++++++++++++++++---------- drone/deliver.sh | 4 ++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 617218e..5a474cf 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -1,10 +1,9 @@ kind: pipeline type: docker -name: Deliver -mode: parallel +name: Android steps: - - name: Android + - name: Deliver image: override6/tbasket-frontend:latest workspace: path: /src/android @@ -17,7 +16,14 @@ steps: - bash drone/deliver.sh android - bash drone/android-sign.sh - - name: Electron +--- + +kind: pipeline +type: docker +name: Electron + +steps: + - name: Deliver image: override6/tbasket-frontend:latest workspace: path: /src/electron @@ -29,7 +35,14 @@ steps: commands: - bash drone/deliver.sh electron - - name: Web +--- + +kind: pipeline +type: docker +name: Apache + +steps: + - name: Deliver image: override6/tbasket-frontend:latest workspace: path: /src/web @@ -40,8 +53,3 @@ steps: from_secret: SSH_PUBLIC commands: - bash drone/deliver.sh browser - - - name: dummy - image: ubuntu:latest - depends_on: - - "Web" \ No newline at end of file diff --git a/drone/deliver.sh b/drone/deliver.sh index 7c2af50..097eea0 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -47,8 +47,8 @@ esac #install cordova -cordova platform add "$TYPE" -cordova build "$TYPE" $OPTIONS +cordova platform add "$TYPE" || exit 1 +cordova build "$TYPE" $OPTIONS || exit 1 echo "delivering outputs on server"