Merge branch 'main' of https://github.com/NDRAEY/DesktopZephyr

NDRAEY · Mar 6, 2024 · 7b4d275 · 7b4d275
2 parents 55725e3 + f79894c
commit 7b4d275
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
@@ -30,19 +30,61 @@ jobs:
 
       - name: Test
         run: echo HI!
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Chocolatey
+        shell: pwsh
+        run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+      - name: Install MinGw and Zip
+        run: choco install mingw zip
+
+      - name: Set up Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.5.1'
+          arch: 'win64_mingw'
+
+      - name: Configure and build
+        run: |
+          mkdir build
+          cd build
+          cmake -G "MinGW Makefiles" ..
+          cmake --build .
+
+      - name: Deploy app
+        run: D:/a/DesktopZephyr/Qt/6.5.1/mingw_64/bin/windeployqt.exe build/
+
+      - name: Archive app
+        run: zip -r DesktopZephyr_Windows.zip build/
+
+      - name: Push binaries
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows-binaries
+          path: DesktopZephyr_Windows.zip
+
 
   upload_release:
     runs-on: ubuntu-latest
 
     needs: [build_linux, build_windows]
 
     steps:
-      - name: Download artifacts
+      - name: Download artifacts (Linux)
         uses: actions/download-artifact@v2
         with:
           name: linux-binaries
           path: artifacts/
 
+      - name: Download artifacts (Windows)
+        uses: actions/download-artifact@v2
+        with:
+          name: windows-binaries
+          path: artifacts/
+
       - name: Test
         run: ls -lh
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,4 +43,8 @@ qt_add_executable(DesktopZephyr
 	${SOURCES} ${OS_SOURCES} 
 )
 
+if(WIN32)
+    set_property(TARGET DesktopZephyr PROPERTY WIN32_EXECUTABLE true)
+endif()
+
 target_link_libraries(DesktopZephyr PRIVATE Qt6::Core Qt6::Widgets ${OS_LINK})