[CI] WIP xenia-project#3 - Workflow for QT: Windows & Linux Jobs

Gliniak · Aug 15, 2023 · 0d5d242 · 0d5d242
1 parent 6445294
commit 0d5d242
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -55,9 +55,11 @@ jobs:
         config:
           - {vsver: VS2019, runs-on: windows-2019}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Repository
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
+
       - name: Get QT binaries
         shell: cmd
         run: |
@@ -70,12 +72,16 @@ jobs:
         run: .\xb setup
 
       - name: Build GUI Test App
-        run: .\xb build --config=Release --target=src\xenia-ui-qt-demoapp
+        run: .\xb build --config=Release --target=src/xenia-ui-qt-demoapp
 
       - name: Prepare artifacts
         run: |
-          robocopy . build\bin\${{ runner.os }}\Release                                              LICENSE /r:0 /w:0
-          robocopy   build\bin\${{ runner.os }}\Release artifacts\xenia_qt   xenia-ui-qt-demoapp.exe LICENSE /r:0 /w:0
+          robocopy . build/bin/${{ runner.os }}/Release                                                               LICENSE /r:0 /w:0
+          robocopy   build/bin/${{ runner.os }}/Release artifacts/xenia_qt                   xenia-ui-qt-demoapp.exe  LICENSE /r:0 /w:0
+          robocopy   third_party/qt_binary/6.5.2/msvc2019_64/bin/Qt6Core.dll                 Qt6Core.dll                      /r:0 /w:0
+          robocopy   third_party/qt_binary/6.5.2/msvc2019_64/bin/Qt6Gui.dll                  Qt6Gui.dll                       /r:0 /w:0
+          robocopy   third_party/qt_binary/6.5.2/msvc2019_64/bin/Qt6Widgets.dll              Qt6Widgets.dll                   /r:0 /w:0
+          robocopy   third_party/qt_binary/6.5.2/msvc2019_64/plugins/platforms/qwindows.dll  platforms/qwindows.dll           /r:0 /w:0
 
           If ($LastExitCode -le 7) { echo "LastExitCode = $LastExitCode";$LastExitCode = 0 }
 

diff --git a/src/xenia/ui/qt/premake5.lua b/src/xenia/ui/qt/premake5.lua
@@ -10,7 +10,12 @@ project("xenia-ui-qt")
 
   -- Setup Qt libraries
   qt.enable()
-  qtpath "../../../../third_party/qt_binary/6.5.2/msvc2019_64"
+  filter("platforms:Linux")
+    qtpath "../../../../third_party/qt_binary/6.5.2/gcc_64"
+
+  filter("platforms:Windows")
+    qtpath "../../../../third_party/qt_binary/6.5.2/msvc2019_64"
+
   qtmodules{"core", "gui", "widgets"}
   qtprefix "Qt6"
 
@@ -44,7 +49,12 @@ project("xenia-ui-qt-demoapp")
 
   -- Setup Qt libraries
   qt.enable()
-  qtpath "../../../../third_party/qt_binary/6.5.2/msvc2019_64"
+  filter("platforms:Linux")
+    qtpath "../../../../third_party/qt_binary/6.5.2/gcc_64"
+
+  filter("platforms:Windows")
+    qtpath "../../../../third_party/qt_binary/6.5.2/msvc2019_64"
+
   qtmodules{"core", "gui", "widgets"}
   qtprefix "Qt6"