Merge branch 'main' into bad_apple

.github/workflows/msix.yml → .github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Build Windows app MSIX
+name: Publish Windows and Android apps
 
 # Builds a Windows App Installer (.msix) for the Dashboard
 # 
@@ -22,6 +22,11 @@ jobs:
     - name: Clone repository
       uses: actions/checkout@v3
 
+    - name: Setup Java
+      uses: actions/setup-java@v1
+      with: 
+        java-version: '12.x'
+
     - name: Load certificate
       run: |
         echo "${{ env.windows_certificate }}" > windows_certificate_decoded.txt
@@ -40,10 +45,15 @@ jobs:
         dart analyze
         dart run msix:create
 
+    - name: Build APK
+      run: flutter build apk
+
     - name: Create Release
       uses: softprops/[email protected]
       with: 
-        files: build/windows/x64/runner/Release/Dashboard.msix
+        files: |
+          build/windows/x64/runner/Release/Dashboard.msix
+          build/app/outputs/apk/release/app-release.apk
         name: ${{ github.ref_name }}
         generate_release_notes: true
         fail_on_unmatched_files: true