Add new upload-nightlies step

Move DIR to before where it is needed
Merge pull request 'Don't exit 1 in upload releases script' (#850 ) from android_foreground_fix into trunk
2024-02-26 19:14:17 +00:00 · 2024-02-26 19:14:17 +00:00 · 2024-02-26 18:07:42 +00:00
2 changed files with 24 additions and 5 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -114,8 +114,28 @@ steps:
      - flutter test --coverage
      - genhtml coverage/lcov.info -o coverage/html

+  - name: upload-nightlies
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    environment:
+      BUILDFILES_KEY:
+        from_secret: buildfiles_key
+    volumes:
+      - name: deps
+        path: /root/.pub-cache
+    when:
+        event: push
+        status: [ success ]
+    commands:
+      - echo $BUILDFILES_KEY > ~/id_rsab64
+      - base64 -d ~/id_rsab64 > ~/id_rsa
+      - chmod 400 ~/id_rsa
+      # TODO When we update Flutter Container to 3.19 migrate these calls...
+      - apt update
+      - apt install -y jq openssh-client ca-certificates curl
+      - ./uploaded-releases.sh deploy/cwtch-`cat VERSION`.apk application/vnd.android.package-archive
+
  - name: deploy-buildfiles
-    image: openpriv/drone-gogs
+    image: kroniak/ssh-client
    pull: if-not-exists
    environment:
      BUILDFILES_KEY:
@ -128,9 +148,6 @@ steps:
      - echo $BUILDFILES_KEY > ~/id_rsab64
      - base64 -d ~/id_rsab64 > ~/id_rsa
      - chmod 400 ~/id_rsa
-      - ./gen-nightly-index.sh $DIR
-      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa cwtch-nightly.html buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
-      - ./uploaded-releases.sh deploy/cwtch-`cat VERSION`.apk application/vnd.android.package-archive
      - export DIR=flwtch-`cat COMMIT_DATE`-`cat VERSION`
      - mv deploy $DIR
      - cp -r coverage/html $DIR/coverage-tests
@ -140,6 +157,8 @@ steps:
      - mv ./../sha512s.txt .
      - cd ..
      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
+      - ./gen-nightly-index.sh $DIR
+      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa cwtch-nightly.html buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/

  - name: notify-gogs
    image: openpriv/drone-gogs
--- a/upload-releases.sh
+++ b/upload-releases.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 VERSION=$(cat VERSION)
 echo "Grabbing Release Data From:"  "https://git.openprivacy.ca/api/v1/repos/$DRONE_REPO/releases/tags/$VERSION"
Author	SHA1	Message	Date
Sarah Jamie Lewis	ff7d1cbd05	Add new upload-nightlies step continuous-integration/drone/pr Build is pending Details	2024-02-26 19:14:17 +00:00
Sarah Jamie Lewis	3014a85803	Move DIR to before where it is needed	2024-02-26 19:14:17 +00:00
Sarah Jamie Lewis	a2f0fbdb38	Merge pull request 'Don't exit 1 in upload releases script' (#850 ) from android_foreground_fix into trunk continuous-integration/drone/push Build is failing Details Reviewed-on: #850	2024-02-26 18:07:42 +00:00