mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Update Windows Qt6 version from 6.5.0 to 6.7.1 (#5420)
This commit is contained in:
parent
d161036b18
commit
be7b517499
4 changed files with 8 additions and 33 deletions
36
.github/workflows/build.yml
vendored
36
.github/workflows/build.yml
vendored
|
@ -120,7 +120,7 @@ jobs:
|
|||
skip-crashpad: false
|
||||
# Windows
|
||||
- os: windows-latest
|
||||
qt-version: 6.5.0
|
||||
qt-version: 6.7.1
|
||||
force-lto: false
|
||||
plugins: true
|
||||
skip-artifact: false
|
||||
|
@ -165,26 +165,6 @@ jobs:
|
|||
modules: qt5compat qtimageformats
|
||||
version: ${{ matrix.qt-version }}
|
||||
|
||||
- name: Install Qt 6.5.3 imageformats
|
||||
if: startsWith(matrix.qt-version, '6.')
|
||||
uses: jurplel/install-qt-action@v4.0.0
|
||||
with:
|
||||
cache: false
|
||||
modules: qtimageformats
|
||||
set-env: false
|
||||
version: 6.5.3
|
||||
extra: --noarchives
|
||||
|
||||
- name: Find Qt 6.5.3 Path
|
||||
if: startsWith(matrix.qt-version, '6.') && startsWith(matrix.os, 'windows')
|
||||
shell: pwsh
|
||||
id: find-good-imageformats
|
||||
run: |
|
||||
cd "$Env:RUNNER_WORKSPACE/Qt/6.5.3"
|
||||
cd (Get-ChildItem)[0].Name
|
||||
cd plugins/imageformats
|
||||
echo "PLUGIN_PATH=$(pwd)" | Out-File -Path "$Env:GITHUB_OUTPUT" -Encoding ASCII
|
||||
|
||||
# WINDOWS
|
||||
- name: Enable Developer Command Prompt (Windows)
|
||||
if: startsWith(matrix.os, 'windows')
|
||||
|
@ -273,12 +253,6 @@ jobs:
|
|||
cp bin/chatterino.exe Chatterino2/
|
||||
echo nightly > Chatterino2/modes
|
||||
|
||||
- name: Fix Qt6 (windows)
|
||||
if: startsWith(matrix.qt-version, '6.') && startsWith(matrix.os, 'windows')
|
||||
working-directory: build
|
||||
run: |
|
||||
cp ${{ steps.find-good-imageformats.outputs.PLUGIN_PATH }}/qwebp.dll Chatterino2/imageformats/qwebp.dll
|
||||
|
||||
- name: Package (windows)
|
||||
if: startsWith(matrix.os, 'windows')
|
||||
working-directory: build
|
||||
|
@ -360,15 +334,15 @@ jobs:
|
|||
|
||||
# Windows
|
||||
- uses: actions/download-artifact@v4
|
||||
name: Windows Qt6.5.0
|
||||
name: Windows Qt6.7.1
|
||||
with:
|
||||
name: chatterino-windows-x86-64-Qt-6.5.0.zip
|
||||
name: chatterino-windows-x86-64-Qt-6.7.1.zip
|
||||
path: release-artifacts/
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
name: Windows Qt6.5.0 symbols
|
||||
name: Windows Qt6.7.1 symbols
|
||||
with:
|
||||
name: chatterino-windows-x86-64-Qt-6.5.0-symbols.pdb.7z
|
||||
name: chatterino-windows-x86-64-Qt-6.7.1-symbols.pdb.7z
|
||||
path: release-artifacts/
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
|
|
2
.github/workflows/create-installer.yml
vendored
2
.github/workflows/create-installer.yml
vendored
|
@ -18,7 +18,7 @@ jobs:
|
|||
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
|
||||
strategy:
|
||||
matrix:
|
||||
qt-version: ["6.5.0"]
|
||||
qt-version: ["6.7.1"]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
|
|
2
.github/workflows/test-windows.yml
vendored
2
.github/workflows/test-windows.yml
vendored
|
@ -24,7 +24,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os: [windows-latest]
|
||||
qt-version: [5.15.2, 6.5.0]
|
||||
qt-version: [5.15.2, 6.7.1]
|
||||
plugins: [false]
|
||||
skip-artifact: [false]
|
||||
skip-crashpad: [false]
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
- Minor: Added the ability to duplicate tabs. (#5277)
|
||||
- Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
|
||||
- Bugfix: Fixed a crash that could occur when logging was enabled in IRC servers that were removed. (#5419)
|
||||
- Dev: Update Windows build from Qt 6.5.0 to Qt 6.7.1. (#5420)
|
||||
- Dev: Use Qt's high DPI scaling. (#4868, #5400)
|
||||
- Dev: Add doxygen build target. (#5377)
|
||||
- Dev: Make printing of strings in tests easier. (#5379)
|
||||
|
|
Loading…
Reference in a new issue