diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2182a9e..34a8fe2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,3 +1,4 @@
+#file: noinspection SpellCheckingInspection
name: Build and Release
on:
release:
@@ -128,9 +129,9 @@ jobs:
uses: shogo82148/actions-upload-release-asset@v1
with:
upload_url: ${{ github.event.release.upload_url }}
- asset_path: out/win64.zip
- asset_name: vtt-desktop-client-windows-x64-${{ github.event.release.tag_name }}.zip
- asset_content_type: application/zip
+ asset_path: out/make/squirrel.windows/x64/vtt-desktop-client-${{ github.event.release.tag_name }} Setup.exe
+ asset_name: vtt-desktop-client-windows-x64-${{ github.event.release.tag_name }}-setup.exe
+ asset_content_type: application/vnd.microsoft.portable-executable
- name: Upload Zip to Release 2
uses: shogo82148/actions-upload-release-asset@v1
with:
diff --git a/.github/workflows/fork.yml b/.github/workflows/fork.yml
index a704556..279b208 100644
--- a/.github/workflows/fork.yml
+++ b/.github/workflows/fork.yml
@@ -1,3 +1,4 @@
+#file: noinspection SpellCheckingInspection
name: Merge to fork
on:
push:
@@ -16,4 +17,9 @@ jobs:
type: now
from_branch: main
target_branch: pull-request-no-injection
- github_token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ - name: create pull request
+ if: failure()
+ run: gh pr create -B pull-request-no-injection -H main --title 'Merge main into pull-request-no-injection' --body 'Created by Github action'
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.idea/fvtt-player-client.iml b/.idea/fvtt-player-client.iml
index e476027..540ab7a 100644
--- a/.idea/fvtt-player-client.iml
+++ b/.idea/fvtt-player-client.iml
@@ -11,5 +11,7 @@