Skip to content

Commit

Permalink
Slowly updating Sigil's Windows CI [deploy]
Browse files Browse the repository at this point in the history
Moving to Visual Studio 2022, Python 3.11.3
  • Loading branch information
dougmassay authored Jul 19, 2023
1 parent f123950 commit c458e80
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ env:
QT: MyQtx64_WE\Qt5.12.9
INNO: C:\Program Files (x86)\Inno Setup 6
CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1
PYTHON: \hostedtoolcache\windows\Python\3.9.9\x64
PYTHON: \hostedtoolcache\windows\Python\3.11.3\x64

jobs:
build:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: windows-2019
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python 3.9.9
uses: actions/setup-python@v2
- name: Set up Python 3.11.3
uses: actions/setup-python@v4
with:
python-version: 3.9.9
python-version: 3.11.3

- name: Cache Custom Qt
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{runner.workspace}}\${{env.QT}}
key: ${{ runner.os }}-qtdeps-${{hashFiles('**/reset-win-caches.txt')}}
Expand All @@ -79,17 +79,17 @@ jobs:
python -m pip install pip==21.0.1
pip install six==1.16.0
pip install html5lib==1.1
pip install regex==2021.11.10
pip install css-parser==1.0.7
pip install cssselect==1.1.0
pip install urllib3==1.26.7
pip install certifi==2021.10.8
pip install dulwich==0.20.26 --global-option="--pure"
pip install chardet==4.0.0
pip install pillow==8.4.0
pip install regex==2023.3.23
pip install css-parser==1.0.8
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 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 lxml==4.7.1
pip install lxml==4.9.2
- name: Create Build Environment
shell: cmd
Expand All @@ -108,12 +108,12 @@ jobs:
working-directory: ${{runner.workspace}}\build
run: |
set PATH=C:\%PYTHON%;${{runner.workspace}}\%QT%\bin;%PATH%
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.1
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
echo %PATH%
cmake %GITHUB_WORKSPACE% ^
-G "Ninja" ^
-DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-DPYTHON_LIBRARY="C:\%PYTHON%\libs\python39.lib" ^
-DPYTHON_LIBRARY="C:\%PYTHON%\libs\python311.lib" ^
-DPYTHON_INCLUDE_DIR="C:\%PYTHON%\include" ^
-DPYTHON_EXECUTABLE="C:\%PYTHON%\python.exe" ^
-DUSE_ALT_ICONS=1 ^
Expand All @@ -127,11 +127,11 @@ jobs:
if: "contains(github.event.head_commit.message, '[deploy]')"
run: |
set PATH=C:\%PYTHON%;%INNO%;${{runner.workspace}}\%QT%\bin;%PATH%
set /p RedistVersion=<"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\Microsoft.VCRedistVersion.default.txt"
set REDIST=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Redist\MSVC\%RedistVersion%\vcredist_x64.exe
set /p RedistVersion=<"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCRedistVersion.default.txt"
set REDIST=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\%RedistVersion%\vcredist_x64.exe
echo "%REDIST%"
cp '%REDIST%' %GITHUB_WORKSPACE%\installer\
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.1
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
ninja -j2 makeinstaller
- name: Upload to gdrive
Expand Down

0 comments on commit c458e80

Please sign in to comment.