Merge branch 'trunk' into peersettings

.drone.yml

@@ -30,14 +30,11 @@ steps:
   #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
 
   - name: build-linux
-    image: cirrusci/flutter:dev
+    image: openpriv/flutter-desktop:dev
     volumes:
       - name: deps
         path: /root/.pub-cache
     commands:
-      - flutter config --enable-linux-desktop
-      - apt-get update
-      - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev
       - flutter build linux
       - mkdir deploy/linux
       - cp -r build/linux/x64/release/bundle/* deploy/linux
@@ -54,6 +51,16 @@ steps:
       - mkdir deploy/android
       - cp build/app/outputs/bundle/release/app-release.aab deploy/android
 
+  - name: widget-tests
+    image: cirrusci/flutter:dev
+    volumes:
+      - name: deps
+        path: /root/.pub-cache
+    commands:
+  #    - flutter config --enable-linux-desktop
+      - flutter test --coverage
+      - genhtml coverage/lcov.info -o coverage/html
+
   # Todo: gonna need more work on container
   #   https://flutter.dev/desktop
   #   requirements: Visual Studio 2019 (not to be confused with Visual Studio Code) with the “Desktop development with C++” workload installed, including all of its default components
@@ -81,6 +88,8 @@ steps:
       - chmod 400 ~/id_rsa
       - export DIR=flwtch-`cat VERSION`-`cat BUILDDATE`
       - mv deploy $DIR
+      - cp -r coverage/html $DIR/coverage-tests
+      - cp -r test/failures $DIR/test-failures || true
       - cd $DIR
       - find . -type f -exec sha256sum {} \; > ./../sha256s.txt
       - mv ./../sha256s.txt .
@@ -90,10 +99,11 @@ steps:
 
   - name: notify-email
     image: drillster/drone-email
-    host: build.openprivacy.ca
-    port: 25
-    skip_verify: true
-    from: drone@openprivacy.ca
+    settings:
+      host: build.openprivacy.ca
+      port: 25
+      skip_verify: true
+      from: drone@openprivacy.ca
     when:
       status: [ failure ]
 
@@ -105,7 +115,8 @@ steps:
     environment:
       GOGS_ACCOUNT_TOKEN:
         from_secret: gogs_account_token
-    gogs_url: https://git.openprivacy.ca
+    settings:
+      gogs_url: https://git.openprivacy.ca
 
 volumes:
   - name: deps