From 1291d24ee355f5ab5a2d6f6404d484e59712fdaf Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 16 Dec 2022 20:13:23 +0100 Subject: [PATCH 01/12] Use seafile api to upload files directly --- .drone.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index b44e56a..ccf6795 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,24 +33,30 @@ steps: - ./gradlew bundleRelease - name: deploy latest build - image: busybox - volumes: - - name: deploy - path: /tmp/deploy +image: busybox + environment: + SEAFILE_API_KEY: + from_secret: SeafileApiKey commands: - - mkdir -p /tmp/deploy/lastBuild - - cp ./app/build/outputs/apk/release/app-release.apk /tmp/deploy/lastBuild/app-release_latest.apk - - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release_latest.aab + - APK_FILE="app/build/outputs/apk/release/app-release.apk" + - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" + - UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/) + - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK" + - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK" - name: deploy tagged build image: busybox - volumes: - - name: deploy - path: /tmp/deploy + environment: + SEAFILE_API_KEY: + from_secret: SeafileApiKey commands: - - mkdir -p /tmp/deploy/tagged/$DRONE_TAG - - cp ./app/build/outputs/apk/release/app-release.apk /tmp/deploy/tagged/$DRONE_TAG/app-release$DRONE_TAG.apk - - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/tagged/$DRONE_TAG/app-release_$DRONE_TAG.aab + - APK_FILE="app/build/outputs/apk/release/app-release$DRONE_TAG.apk" + - BUNDLE_FILE="app/build/outputs/bundle/release/app-release$DRONE_TAG.aab" + - mv app/build/outputs/apk/release/app-release.apk $APK_FILE + - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE + - UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/) + - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK" + - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK" when: event: - tag @@ -63,10 +69,4 @@ steps: when: status: - failure - - success - - -volumes: - - name: deploy - host: - path: /mnt/seafile-sync-cli/TichuCounter \ No newline at end of file + - success \ No newline at end of file From e1634dafd97e0a0625231a6d72219ae01e062dbd Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 16 Dec 2022 20:15:07 +0100 Subject: [PATCH 02/12] Fix format. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ccf6795..c66b154 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - ./gradlew bundleRelease - name: deploy latest build -image: busybox + image: busybox environment: SEAFILE_API_KEY: from_secret: SeafileApiKey From 5ee8b4114b0e4cc01f05335486d17f71ec244347 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 16 Dec 2022 21:10:01 +0100 Subject: [PATCH 03/12] put complex commands in quotes. --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index c66b154..bc8af79 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,9 +40,9 @@ steps: commands: - APK_FILE="app/build/outputs/apk/release/app-release.apk" - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" - - UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/) - - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK" - - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK" + - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' - name: deploy tagged build image: busybox @@ -54,9 +54,9 @@ steps: - BUNDLE_FILE="app/build/outputs/bundle/release/app-release$DRONE_TAG.aab" - mv app/build/outputs/apk/release/app-release.apk $APK_FILE - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE - - UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/) - - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK" - - curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK" + - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' when: event: - tag From c3999f45d92a09cc9a1d5d6ee48b5cd7dc70d86a Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 16 Dec 2022 23:57:01 +0100 Subject: [PATCH 04/12] Use curl image for deployment --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index bc8af79..ba87641 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - ./gradlew bundleRelease - name: deploy latest build - image: busybox + image: curlimages/curl environment: SEAFILE_API_KEY: from_secret: SeafileApiKey @@ -45,7 +45,7 @@ steps: - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' - name: deploy tagged build - image: busybox + image: curlimages/curl environment: SEAFILE_API_KEY: from_secret: SeafileApiKey From d9486dfec49756bc28e2bbadc12e195daa239350 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 17 Dec 2022 00:09:54 +0100 Subject: [PATCH 05/12] Fix file path references --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index ba87641..18b1083 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,8 +41,8 @@ steps: - APK_FILE="app/build/outputs/apk/release/app-release.apk" - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' - name: deploy tagged build image: curlimages/curl @@ -55,8 +55,8 @@ steps: - mv app/build/outputs/apk/release/app-release.apk $APK_FILE - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' when: event: - tag From 1cc60756d1c5944b61738360730399accfbff0d4 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 17 Dec 2022 00:24:08 +0100 Subject: [PATCH 06/12] Remove double quotes from upload link parameter --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 18b1083..96cbb79 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,8 +41,8 @@ steps: - APK_FILE="app/build/outputs/apk/release/app-release.apk" - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' - name: deploy tagged build image: curlimages/curl @@ -55,8 +55,8 @@ steps: - mv app/build/outputs/apk/release/app-release.apk $APK_FILE - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOADLINK"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' when: event: - tag From f3e50dea8bd38690e34ee9e9e1223175ee02f0e8 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 17 Dec 2022 07:48:12 +0100 Subject: [PATCH 07/12] Remove double quotes from upload link parameter --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 96cbb79..267d6af 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: commands: - APK_FILE="app/build/outputs/apk/release/app-release.apk" - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" - - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' + - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d '"')' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' @@ -54,7 +54,7 @@ steps: - BUNDLE_FILE="app/build/outputs/bundle/release/app-release$DRONE_TAG.aab" - mv app/build/outputs/apk/release/app-release.apk $APK_FILE - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE - - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/)' + - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d '"')' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' when: From beddcb71254beb70b2ef213bb20dd4ae7ddacbfc Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 17 Dec 2022 07:53:41 +0100 Subject: [PATCH 08/12] Fix quote mismatch in commamd --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 267d6af..e703ea3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: commands: - APK_FILE="app/build/outputs/apk/release/app-release.apk" - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" - - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d '"')' + - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d “\"“)' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' @@ -54,7 +54,7 @@ steps: - BUNDLE_FILE="app/build/outputs/bundle/release/app-release$DRONE_TAG.aab" - mv app/build/outputs/apk/release/app-release.apk $APK_FILE - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE - - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d '"')' + - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d “\"“)' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' when: From 72bb963bd261d84cf2f8c43e3b1a1de18653af5c Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sat, 17 Dec 2022 19:05:00 +0100 Subject: [PATCH 09/12] Extract variables to enviroment. Rename file after uplaod on tagged deploy --- .drone.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index e703ea3..5cc6c72 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,26 +37,28 @@ steps: environment: SEAFILE_API_KEY: from_secret: SeafileApiKey + APK_FILE: app/build/outputs/apk/release/app-release.apk + BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab + SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 commands: - - APK_FILE="app/build/outputs/apk/release/app-release.apk" - - BUNDLE_FILE="app/build/outputs/bundle/release/app-release.aab" - - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d “\"“)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 $UPLOADLINK' + - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d “\"“)' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' - name: deploy tagged build image: curlimages/curl environment: SEAFILE_API_KEY: from_secret: SeafileApiKey + APK_FILE: app/build/outputs/apk/release/app-release.apk + BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab + SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 commands: - - APK_FILE="app/build/outputs/apk/release/app-release$DRONE_TAG.apk" - - BUNDLE_FILE="app/build/outputs/bundle/release/app-release$DRONE_TAG.aab" - - mv app/build/outputs/apk/release/app-release.apk $APK_FILE - - mv app/build/outputs/bundle/release/app-release.aab $BUNDLE_FILE - - 'UPLOADLINK=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/daffda8b-5840-4a65-b6d0-73b991facfb6/upload-link/ | tr -d “\"“)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 $UPLOADLINK' + - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/SEAFILE_REPO/upload-link/ | tr -d “\"“)' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' + - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.apk" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.apk' + - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.aan" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.aab' when: event: - tag From e972400313f042c1a09f91ab40d6ed52cf340b85 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sat, 17 Dec 2022 19:10:13 +0100 Subject: [PATCH 10/12] Fix wrong merge from stash. --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5cc6c72..2fd4052 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,8 +42,8 @@ steps: SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 commands: - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d “\"“)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' - name: deploy tagged build image: curlimages/curl @@ -55,8 +55,8 @@ steps: SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 commands: - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/SEAFILE_REPO/upload-link/ | tr -d “\"“)' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' - - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' + - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.apk" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.apk' - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.aan" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.aab' when: From b3793caba2bec88d04dbcb942dd39482ce973c42 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sat, 17 Dec 2022 19:32:19 +0100 Subject: [PATCH 11/12] Fix more copy paste mistakes. --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2fd4052..d000ae9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,7 +41,7 @@ steps: BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 commands: - - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d “\"“)' + - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' @@ -54,7 +54,7 @@ steps: BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 commands: - - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/SEAFILE_REPO/upload-link/ | tr -d “\"“)' + - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.apk" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.apk' From e825c868551ff406037e4abcddf7bf21ac717e2d Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sat, 17 Dec 2022 20:54:49 +0100 Subject: [PATCH 12/12] Fix file name extension --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d000ae9..a2c0734 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,7 +58,7 @@ steps: - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.apk" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.apk' - - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.aan" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.aab' + - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.aab" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.aab' when: event: - tag