From 0faaf9b7ee1f326434359ca5b265b41638782745 Mon Sep 17 00:00:00 2001
From: Hamed Masafi <hamed.masafi@gmail.com>
Date: Sun, 23 Aug 2020 10:13:55 +0430
Subject: [PATCH] win

---
 .github/workflows/qt.yml | 13 ++-----------
 installer/init.bat       | 11 +++++++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml
index a93cbaf..38884e8 100644
--- a/.github/workflows/qt.yml
+++ b/.github/workflows/qt.yml
@@ -14,8 +14,6 @@ jobs:
           - gcc_64
           - msvc2019
           - msvc2019_64
-          - mingw81_64
-          - mingw81_32
           - clang_64
 
         include:
@@ -31,12 +29,6 @@ jobs:
             os: windows-latest
             osname: windows
             arch: x86
-          - platform: mingw81_64
-            os: windows-latest
-            arch: x86_64
-          - platform: mingw81_32
-            os: windows-latest
-            arch: x86_64
           - platform: clang_64
             os: macos-latest
             osname: macos
@@ -63,14 +55,13 @@ jobs:
           ${{steps.qt.outputs.make}}
           ${{steps.qt.outputs.make}} install
           
-      - name: Build installer for linux
-        if: matrix.osname != ''
+      - name: Build installer
         run: |
             installer/init ${{steps.qt.outputs.qtdir}} ${{matrix.osname}} ${{matrix.arch}}
             
       - name: upload app to releases
         uses: Skycoder42/action-upload-release@master
-        if: startsWith(github.ref, 'refs/tags/') && (matrix.osname == 'linux' || matrix.osname == 'macos')
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           repo_token: ${{secrets.GITHUB_TOKEN}}
           directory: installer/${{matrix.osname}}/output
diff --git a/installer/init.bat b/installer/init.bat
index 65c0672..9f6b2da 100755
--- a/installer/init.bat
+++ b/installer/init.bat
@@ -9,13 +9,20 @@ set arch=%3
 
 set pwd=%~dp0
 set out_path=%pwd%\output
-set data_path="%pwd%\packages\ir.tooska.confiqt\data\"
+set data_path=%pwd%\packages\ir.tooska.confiqt\data\
 
 rem create_paths
 mkdir %out_path%
 
 rem  copy files
-xcopy /y /q %pwd%\QtConfig.exe %data_path% 
+xcopy /y /q %pwd%\..\release\QtConfig.exe %data_path% 
+
+echo Copying files to data dir
+if %arch%==x86 (
+	%qt_path%\5.15.0\msvc2019\bin\windeployqt.exe --verbose 0 %data_path%
+) else (
+	%qt_path%\5.15.0\msvc2019_64\bin\windeployqt.exe --verbose 0 %data_path%
+)
 
 rem  make setup
 set binary_creator=%qt_path%\Tools\QtInstallerFramework\3.2\bin\binarycreator.exe