Merge branch 'master' of github.com:opengs/itarmykit

opengs · Oct 13, 2023 · df7f189 · df7f189
2 parents 633e858 + 996774e
commit df7f189
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.electron.yml b/.github/workflows/build.electron.yml
@@ -26,7 +26,7 @@ jobs:
           EP_GH_IGNORE_TIME: true
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         run: |
-          quasar build --mode electron --publish always -T linux
+          quasar build --mode electron --publish always -T linux --icon=/src-electron/icons/icon.png
   build_for_windows:
     name: Build for windows
     runs-on: windows-2022
@@ -45,7 +45,7 @@ jobs:
           EP_GH_IGNORE_TIME: true
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         run: |
-          quasar build --mode electron --publish always -T win32
+          quasar build --mode electron --publish always -T win32 --icon=/src-electron/icons/icon.ico
   build_for_macos:
     name: Build for macos
     runs-on: macos-12
@@ -68,4 +68,4 @@ jobs:
           EP_GH_IGNORE_TIME: true
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         run: |
-          quasar build --mode electron --publish always -T darwin
+          quasar build --mode electron --publish always -T darwin --icon=/src-electron/icons/icon.icns
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src-electron/icons/icon.icns b/src-electron/icons/icon.icns
diff --git a/src-electron/icons/icon.ico b/src-electron/icons/icon.ico