More Windows CI updates

Sigil-Ebook · Jul 19, 2023 · 692bcff · 692bcff
1 parent c458e80
commit 692bcff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/reset-win-caches.txt b/.github/workflows/reset-win-caches.txt
@@ -1 +1,2 @@
 Change the content of this file to reset the caches for the github actions sigil windows build
+Reset cache on 7-July-2023
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -29,11 +29,11 @@ on:
 
 env:
   BUILD_TYPE: Release
-  DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/MyQtx64_5.12.9_VS2017_WE.7z
+  DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt5.15.9_x64_VS2022.7z
   GDRIVE: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/gdrive-windows-x64.exe
   GDRIVE_REFRESH_TOKEN: ${{ secrets.GDRIVE_REFRESH_TOKEN }}
   GDRIVE_DIR: ${{ secrets.SIGIL_WIN_GDRIVE_DIR }}
-  QT: MyQtx64_WE\Qt5.12.9
+  QT: Qt5.15.9
   INNO: C:\Program Files (x86)\Inno Setup 6
   CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1
   PYTHON: \hostedtoolcache\windows\Python\3.11.3\x64
@@ -60,9 +60,8 @@ jobs:
     - name: Install Custom Qt
       shell: cmd
       run: |
-        if not exist ${{runner.workspace}}\%QT% cd ${{runner.workspace}} & curl -L -o webkit.7z "%DOWNLOADQT%" & 7z x webkit.7z -y
-        if exist ${{runner.workspace}}\%QT%\bin cd ${{runner.workspace}}\%QT%\bin & echo [Paths] > qt.conf
-        if exist ${{runner.workspace}}\%QT%\bin cd ${{runner.workspace}}\%QT%\bin & echo Prefix=.. >> qt.conf
+        if not exist ${{runner.workspace}}\%QT% cd ${{runner.workspace}} & curl -L -o qt.7z "%DOWNLOADQT%" & 7z x qt.7z -y
+
 
     - uses: lukka/get-cmake@latest
 
@@ -87,8 +86,8 @@ jobs:
         pip install dulwich==0.21.3 --global-option="--pure"
         pip install chardet==5.1.0
         pip install pillow==9.5.0
-        pip install PyQt5==5.12.3 PyQt5-sip==12.8.1
-        pip install PyQtWebEngine==5.12.1
+        pip install PyQt5==5.15.9 PyQt5-sip==12.12.0
+        pip install PyQtWebEngine==5.15.6
         pip install lxml==4.9.2
 
     - name: Create Build Environment
@@ -142,7 +141,7 @@ jobs:
         set PATH=C:\%PYTHON%;${{runner.workspace}}\build;%PATH%
         python %GITHUB_WORKSPACE%\ci_scripts\newgddeploy.py
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: "contains(github.event.head_commit.message, '[deploy]')"
       with:
         name: sigil-installer