kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-07-30 07:44:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Windows Qt5/Qt6 CI test, enable -platform windows:fontengine=freetype add new .bat for Qt6 installer and portable version

Browse Source
This commit is contained in:
Laurent Trinques
2026-07-19 21:15:13 +02:00
parent 3c1eb9b970
commit adb3473a2c
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/windows-msi.yml
+17 -10
View File
@@ -125,6 +125,18 @@ jobs:
Write-Host "Version MSI : $verMsi" Write-Host "Version MSI : $verMsi"
Write-Host "Version display : $verDisplay" Write-Host "Version display : $verDisplay"
# Qt platform argument: only Qt5 needs the QTBUG-83161 font-rendering
# workaround (GDI backend). Qt6 uses DirectWrite by default and does
# not need it. Computed once here so both the bundled "Lancer QET.bat"
# and the MSI shortcuts (wix build -d QtPlatformArgs=...) stay in sync.
if ("${{ matrix.flavor }}" -eq "qt5") {
$qtArgs = "-platform windows:fontengine=freetype"
} else {
$qtArgs = ""
}
echo "QT_ARGS=$qtArgs" >> $env:GITHUB_OUTPUT
Write-Host "Qt platform args: '$qtArgs'"
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# 4. Install WiX v7, accept EULA and install WixUI extension # 4. Install WiX v7, accept EULA and install WixUI extension
# ---------------------------------------------------------------- # ----------------------------------------------------------------
@@ -209,10 +221,11 @@ jobs:
- name: Replace Lancer QET.bat for MSI - name: Replace Lancer QET.bat for MSI
shell: pwsh shell: pwsh
run: | run: |
$qtArgs = "${{ steps.version.outputs.QT_ARGS }}"
$bat = "$env:FILES_DIR\Lancer QET.bat" $bat = "$env:FILES_DIR\Lancer QET.bat"
$content = "@echo off`r`nstart `"`" `"%~dp0bin\qelectrotech.exe`" --common-elements-dir=`"%~dp0elements/`" --common-tbt-dir=`"%~dp0titleblocks/`" --lang-dir=`"%~dp0lang/`" -style windowsvista`r`n" $content = "@echo off`r`nstart `"`" `"%~dp0bin\qelectrotech.exe`" --common-elements-dir=`"%~dp0elements/`" --common-tbt-dir=`"%~dp0titleblocks/`" --lang-dir=`"%~dp0lang/`" $qtArgs`r`n"
[System.IO.File]::WriteAllText($bat, $content, [System.Text.Encoding]::ASCII) [System.IO.File]::WriteAllText($bat, $content, [System.Text.Encoding]::ASCII)
Write-Host "Lancer QET.bat replaced for MSI installation." Write-Host "Lancer QET.bat replaced for MSI installation (qtArgs: '$qtArgs')."
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# 9. Build the MSI (unsigned) # 9. Build the MSI (unsigned)
@@ -244,13 +257,7 @@ jobs:
Write-Host " ProductCode : $productCode" Write-Host " ProductCode : $productCode"
Write-Host " Output : dist\$outputName" Write-Host " Output : dist\$outputName"
if ("${{ matrix.flavor }}" -eq "qt5") { $qtArgs = "${{ steps.version.outputs.QT_ARGS }}"
$qtArgs = "-platform windows:fontengine=freetype"
}
else {
$qtArgs = ""
}
wix build $wxs ` wix build $wxs `
-arch x64 ` -arch x64 `
@@ -307,7 +314,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO: ${{ github.repository }} REPO: ${{ github.repository }}
run: | run: |
$pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6-EXPERIMENTAL.*\.msi$" } else { "\.msi$" } $pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6-EXPERIMENTAL.*\\.msi$" } else { "\\.msi$" }
$names = gh release view nightly --repo $env:REPO --json assets --jq ".assets[] | select(.name | test(`"$pattern`")) | .name" $names = gh release view nightly --repo $env:REPO --json assets --jq ".assets[] | select(.name | test(`"$pattern`")) | .name"
foreach ($name in ($names -split "`n" | Where-Object { $_ })) { foreach ($name in ($names -split "`n" | Where-Object { $_ })) {
if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6-EXPERIMENTAL") { continue } if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6-EXPERIMENTAL") { continue }