From 0ea82b137e0699befe81e4eabb4dda8fe37bdaec Mon Sep 17 00:00:00 2001 From: Override-6 Date: Fri, 16 Dec 2022 19:11:37 +0100 Subject: [PATCH] fixing drone scripts --- drone/deliver.sh | 5 ++++- drone/image/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drone/deliver.sh b/drone/deliver.sh index 4ea3f2a..73a2a7c 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -19,6 +19,7 @@ case "$TYPE" in "android") OPTIONS="$OPTIONS -- --packageType=apk" OUT_DIR="platforms/android/app/build/outputs/apk" + tree OUT_DIR || ls OUT_DIR #install gradle wget -q https://services.gradle.org/distributions/gradle-7.5.1-bin.zip -P /tmp @@ -46,6 +47,8 @@ cordova platform add "$TYPE" cordova build "$TYPE" $OPTIONS echo "delivering outputs on server" +tree + #prepare ssh / scp commands curl https://codefirst.iut.uca.fr/git/Tactique-basket/Backend/raw/branch/dev/drone/prepare-deliver.sh > /tmp/prepare-deliver.sh source /tmp/prepare-deliver.sh @@ -53,4 +56,4 @@ SERV_DIR="$DIR/application/$TYPE" echo "making delivery onto '$USER@$IP:$SERV_DIR'" ls $OUT_DIR -scp -o "StrictHostKeyChecking no" -r "$OUT_DIR/*" "$USER@$IP:$SERV_DIR" \ No newline at end of file +scp -o "StrictHostKeyChecking no" -r "$OUT_DIR/" "$USER@$IP:$SERV_DIR" \ No newline at end of file diff --git a/drone/image/Dockerfile b/drone/image/Dockerfile index b007fa5..f335d94 100644 --- a/drone/image/Dockerfile +++ b/drone/image/Dockerfile @@ -1,3 +1,3 @@ FROM alvrme/alpine-android:android-32-jdk11 -RUN (apk update && apk add npm openssh-client) &&\ +RUN (apk update && apk add npm openssh-client tree) &&\ npm install -g cordova