Merge pull request #101 from osociety/dev

Dev -> Main

Author: git-elliot

.github/workflows/automerge.yml

@@ -0,0 +1,31 @@
+name: Automerge
+
+on:
+  workflow_dispatch:
+  schedule:
+    # You can setup schedule here
+    - cron:  '30 5,17 * * *'
+
+env:
+  MY_REPO: https://git-elliot:${{secrets.GITHUB_TOKEN}}@github.com/osociety/vernet.git
+
+  MY_BRANCH: dev
+
+  MASTER_REPO: https://github.com/osociety/vernet.git
+
+  MASTER_BRANCH: main
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Merge with dev
+      run: |
+        git clone ${{env.MY_REPO}} -b ${{env.MY_BRANCH}} tmp
+        cd tmp
+        git config user.name "Automerge Bot"
+        git config user.email "bot@example.com"
+        git config pull.rebase false
+        git pull ${{env.MASTER_REPO}} ${{env.MASTER_BRANCH}}
+        git push

.github/workflows/flutter_release.yml

@@ -116,6 +116,7 @@ jobs:
           type: 'zip'
           filename: Vernet-${{github.ref_name}}-macos.zip
           directory: build/macos/Build/Products/Release/
+          path: vernet.app
 
       - name: macOS Release
         uses: softprops/action-gh-release@v1
@@ -150,13 +151,14 @@ jobs:
         with:
           type: 'zip'
           filename: Vernet-${{github.ref_name}}-windows.zip
-          directory: build/windows/runner/Release
+          directory: build/windows/x64/runner/Release/
+          path: vernet.exe
 
-      - name: macOS Release
+      - name: Windows Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          files: build/windows/runner/Release/Vernet-${{github.ref_name}}-windows.zip
+          files: build/windows/x64/runner/Release/Vernet-${{github.ref_name}}-windows.zip