From f4bfc0562cebbbe33381c3f7da5055b4dfdba52c Mon Sep 17 00:00:00 2001
From: Doug Massay <douglaslmassay@gmail.com>
Date: Wed, 26 Jul 2023 13:09:27 -0400
Subject: [PATCH] Change Windows CI to Qt6 [deploy]

---
 .github/workflows/reset-win-caches.txt              |  1 +
 .github/workflows/win-build.yml                     | 13 +++++++------
 .../python_pkg/windows_python_gather6.py            |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/reset-win-caches.txt b/.github/workflows/reset-win-caches.txt
index 04182280fb..a059059813 100644
--- a/.github/workflows/reset-win-caches.txt
+++ b/.github/workflows/reset-win-caches.txt
@@ -1,2 +1,3 @@
 Change the content of this file to reset the caches for the github actions sigil windows build
 Reset cache on 7-July-2023
+Reset cache on 26-July-2023
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 03ceb20153..b09741a1dd 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -29,8 +29,8 @@ on:
 
 env:
   BUILD_TYPE: Release
-  DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt5.15.9_x64_VS2022.7z
-  QT: Qt5.15.9
+  DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt6.5.2_x64_VS2022.7z
+  QT: Qt6.5.2
   INNO: C:\Program Files (x86)\Inno Setup 6
   CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1
   PYTHON: \hostedtoolcache\windows\Python\3.11.3\x64
@@ -74,12 +74,12 @@ jobs:
         pip install cssselect==1.2.0
         pip install urllib3==1.26.15
         pip install certifi==2022.12.7
-        pip install dulwich==0.21.3 --global-option="--pure"
+        pip install dulwich==0.21.3
         pip install chardet==5.1.0
         pip install pillow==9.5.0
-        pip install PyQt5==5.15.9 PyQt5-sip==12.12.0
-        pip install PyQtWebEngine==5.15.6
         pip install lxml==4.9.2
+        pip install shiboken6@https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/shiboken6-6.5.2-6.5.2-cp311-cp311-win_amd64.whl
+        pip install PySide6@https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/PySide6-6.5.2-6.5.2-cp311-cp311-win_amd64.whl
 
     - name: Create Build Environment
       shell: cmd
@@ -105,7 +105,8 @@ jobs:
         -DPYTHON_INCLUDE_DIR="C:\%PYTHON%\include" ^
         -DPYTHON_EXECUTABLE="C:\%PYTHON%\python.exe" ^
         -DUSE_ALT_ICONS=1 ^
-        -DQt5_DIR="${{runner.workspace}}\$QT\lib\cmake\Qt5" ^
+        -DUSE_QT6=1 ^
+        -DQt6_DIR="${{runner.workspace}}\$QT\lib\cmake\Qt6" ^
         %CMAKE64BIT%
         ninja -j2
 
diff --git a/src/Resource_Files/python_pkg/windows_python_gather6.py b/src/Resource_Files/python_pkg/windows_python_gather6.py
index bfdcbdc8e3..1d011f48bd 100644
--- a/src/Resource_Files/python_pkg/windows_python_gather6.py
+++ b/src/Resource_Files/python_pkg/windows_python_gather6.py
@@ -70,8 +70,8 @@ def copy_site_packages():
 def ignore_in_pyside6_dirs(base, items, ignored_dirs=None):
     ans = []
     if ignored_dirs is None:
-        ignored_dirs = {'.svn', '.bzr', '.git', 'docs', 'examples', 'glue', 'include', 'plugins', 'qml',
-                       'resources', 'scripts', 'support', 'translations', 'typesystems', '__pycache__'}
+        ignored_dirs = {'.svn', '.bzr', '.git', 'docs', 'examples', 'glue', 'include', 'metatypes', 'modules', 
+                       'plugins', 'qml', 'resources', 'scripts', 'support', 'translations', 'typesystems', '__pycache__'}
     for name in items:
         path = os.path.join(base, name)
         if os.path.isdir(path):
@@ -96,7 +96,7 @@ def ignore_in_pyside6_dirs(base, items, ignored_dirs=None):
 def ignore_in_dirs(base, items, ignored_dirs=None):
     ans = []
     if ignored_dirs is None:
-        ignored_dirs = {'.svn', '.bzr', '.git', 'test', 'tests', 'testing', '__pycache__'}
+        ignored_dirs = {'.svn', '.bzr', '.git', 'test', 'tests', 'testing', 'turtledemo', '__pycache__'}
     for name in items:
         path = os.path.join(base, name)
         if os.path.isdir(path):