diff --git a/.github/workflows/windows-build-qt6.yml b/.github/workflows/windows-build-qt6.yml new file mode 100644 index 000000000..d7df1df2b --- /dev/null +++ b/.github/workflows/windows-build-qt6.yml @@ -0,0 +1,348 @@ +name: Windows Build Qt6 (test) + +on: + workflow_dispatch: # Déclenchement manuel uniquement, le temps de valider le build + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-windows-qt6: + runs-on: windows-latest + steps: + - name: Checkout code + uses: actions/checkout@v7 + with: + submodules: recursive + fetch-depth: 0 + + - name: Install MSYS2 + uses: msys2/setup-msys2@v2 + with: + msystem: UCRT64 + update: true + cache: true + install: >- + git + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-cmake + mingw-w64-ucrt-x86_64-ninja + mingw-w64-ucrt-x86_64-qt6-base + mingw-w64-ucrt-x86_64-qt6-svg + mingw-w64-ucrt-x86_64-qt6-tools + mingw-w64-ucrt-x86_64-qt6-translations + mingw-w64-ucrt-x86_64-qt6-pdf + mingw-w64-ucrt-x86_64-sqlite3 + mingw-w64-ucrt-x86_64-pkg-config + mingw-w64-ucrt-x86_64-nsis + mingw-w64-ucrt-x86_64-angleproject + + - name: Cache ccache + uses: actions/cache@v5 + with: + path: C:\Users\runneradmin\AppData\Local\ccache + key: ccache-windows-qt6-${{ github.ref_name }}-${{ github.sha }} + restore-keys: | + ccache-windows-qt6-${{ github.ref_name }}- + ccache-windows-qt6- + + - name: Configure ccache + shell: msys2 {0} + run: | + /ucrt64/bin/ccache --set-config=max_size=500M + /ucrt64/bin/ccache --set-config=compression=true + /ucrt64/bin/ccache -z + echo "=== ccache config ===" + /ucrt64/bin/ccache -p + + - name: Patch NSIS Welcome page — fix title font size + shell: msys2 {0} + run: | + set -euo pipefail + WELCOME_NSH=$(find /ucrt64 -path "*/Modern UI 2/Pages/Welcome.nsh" | head -1) + if [ -z "$WELCOME_NSH" ]; then + echo "WARNING: Welcome.nsh not found, skipping font patch" + else + echo "Patching: $WELCOME_NSH" + sed -i '/WelcomePage\.Title\.Font/s/"[0-9]\+" "700"/"10" "700"/' "$WELCOME_NSH" + grep 'WelcomePage.Title.Font' "$WELCOME_NSH" + echo " OK font size patched to 10" + fi + + FINISH_NSH=$(find /ucrt64 -path "*/Modern UI 2/Pages/Finish.nsh" | head -1) + if [ -z "$FINISH_NSH" ]; then + echo "WARNING: Finish.nsh not found, skipping font patch" + else + echo "Patching: $FINISH_NSH" + sed -i '/FinishPage\.Title\.Font/s/"[0-9]\+" "700"/"10" "700"/' "$FINISH_NSH" + grep 'FinishPage.Title.Font' "$FINISH_NSH" + echo " OK font size patched to 10" + fi + + - name: Build with cmake + shell: msys2 {0} + run: | + set -euo pipefail + cd "$GITHUB_WORKSPACE" + mkdir build && cd build + NPROC=$(nproc) + echo "Available CPUs: $NPROC" + + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_PREFIX_PATH=/ucrt64 \ + -DQt6_DIR=/ucrt64/lib/cmake/Qt6 \ + -DQT_VERSION_MAJOR=6 \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON \ + -DBUILD_WITH_KF5=OFF \ + -DBUILD_TESTING=OFF \ + -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_CXX_FLAGS="-DQET_EXPORT_PROJECT_DB" \ + -DCMAKE_C_COMPILER_LAUNCHER=/ucrt64/bin/ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=/ucrt64/bin/ccache \ + -DSQLite3_INCLUDE_DIR=/ucrt64/include \ + -DSQLite3_LIBRARY=/ucrt64/lib/libsqlite3.dll.a \ + .. + ninja -j"$NPROC" + + - name: Show ccache stats + shell: msys2 {0} + run: | + echo "=== ccache statistics ===" + /ucrt64/bin/ccache -s + + - name: Verify exe was built + shell: msys2 {0} + run: | + set -euo pipefail + EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1) + if [ -z "$EXE" ]; then + echo "ERROR: no qelectrotech.exe found in build/" + find "$GITHUB_WORKSPACE/build" -maxdepth 3 -name "*.exe" || true + exit 1 + fi + SIZE=$(stat -c%s "$EXE") + echo "Exe found: $EXE ($SIZE bytes)" + [ "$SIZE" -gt 100000 ] || { echo "ERROR: exe too small"; exit 1; } + + - name: Deploy — copy exe + windeployqt + DLLs + shell: msys2 {0} + run: | + set -euo pipefail + NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root" + FILES="$NSIS_ROOT/files" + BIN="$FILES/bin" + mkdir -p "$BIN" + + EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1) + echo "Copying exe: $EXE -> $BIN/QElectroTech.exe" + cp "$EXE" "$BIN/QElectroTech.exe" + + cd "$BIN" + /ucrt64/bin/windeployqt6 \ + --release \ + --no-translations \ + --no-compiler-runtime \ + ./QElectroTech.exe || true + + echo "=== 3-pass transitive DLL scan ===" + set +e + for PASS in 1 2 3; do + echo "-- Pass $PASS --" + for bin_file in "$BIN"/*.dll "$BIN"/*.exe "$BIN"/sqldrivers/*.dll "$BIN"/platforms/*.dll "$BIN"/imageformats/*.dll; do + [ -f "$bin_file" ] || continue + while IFS= read -r line; do + dll_path=$(echo "$line" | awk '{print $3}') + [ -f "$dll_path" ] || continue + dll_name=$(basename "$dll_path") + dst="$BIN/$dll_name" + if [ ! -f "$dst" ]; then + cp "$dll_path" "$dst" + echo " Copied (pass $PASS): $dll_name" + fi + done < <(ldd "$bin_file" 2>/dev/null | grep -i '/ucrt64/bin/') + done + done + set -e + + DLL_COUNT=$(find "$BIN" -name "*.dll" | wc -l) + echo "=== $DLL_COUNT DLLs present after scan ===" + ls -lh "$BIN/QElectroTech.exe" || { echo "ERROR: exe missing from bin/"; exit 1; } + [ "$DLL_COUNT" -gt 5 ] || { echo "ERROR: too few DLLs"; exit 1; } + cd "$GITHUB_WORKSPACE" + + cp /ucrt64/bin/libgcc_s_seh-1.dll "$BIN/" + cp /ucrt64/bin/libstdc++-6.dll "$BIN/" + cp /ucrt64/bin/libwinpthread-1.dll "$BIN/" + SQLITE=$(find /ucrt64/bin -name "libsqlite3*.dll" | head -1) + if [ -n "$SQLITE" ]; then + cp "$SQLITE" "$BIN/" + echo "SQLite3 copied: $(basename $SQLITE)" + else + echo "WARNING: libsqlite3 not found in /ucrt64/bin/" + fi + + cp "$GITHUB_WORKSPACE/build-aux/windows/QET64.nsi" "$NSIS_ROOT/" + cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra.nsh" "$NSIS_ROOT/" + cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_fr.nsh" "$NSIS_ROOT/" + cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_missing.nsh" "$NSIS_ROOT/" + cp -r "$GITHUB_WORKSPACE/build-aux/windows/nsis_base/." "$NSIS_ROOT/" + + curl -fsSL \ + "https://raw.githubusercontent.com/qelectrotech/qelectrotech-source-mirror/refs/heads/master/misc/Lancer%20QET.bat" \ + -o "$FILES/Lancer QET.bat" + cp -r "$GITHUB_WORKSPACE/elements" "$FILES/elements" || true + cp -r "$GITHUB_WORKSPACE/titleblocks" "$FILES/titleblocks" || true + cp -r "$GITHUB_WORKSPACE/examples" "$FILES/examples" || true + cp -r "$GITHUB_WORKSPACE/fonts" "$FILES/fonts" || true + + cp -r "$GITHUB_WORKSPACE/lang" "$FILES/lang" || true + find "$GITHUB_WORKSPACE/build" -name "*.qm" -exec cp {} "$FILES/lang/" \; 2>/dev/null || true + echo "=== .qm files in files/lang/ ===" + ls "$FILES/lang/"*.qm 2>/dev/null | wc -l || echo "0 .qm files" + + for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE; do + cp "$GITHUB_WORKSPACE/$f" "$FILES/$f" 2>/dev/null || true + done + + echo "=== Verification of key files in files/ ===" + for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE \ + qet_uninstall_file_associations.reg register_filetypes.bat "Lancer QET.bat"; do + [ -f "$FILES/$f" ] \ + && echo " OK : $f" \ + || echo " MISSING: $f" + done + for d in ico elements lang titleblocks fonts examples bin; do + [ -d "$FILES/$d" ] \ + && echo " OK : $d/" \ + || echo " MISSING: $d/" + done + + - name: Extract version for installer name + shell: msys2 {0} + id: qet_version + run: | + set -euo pipefail + + GITCOMMIT=$(git -C "$GITHUB_WORKSPACE" rev-parse --short HEAD) + + A=$(git -C "$GITHUB_WORKSPACE" rev-list HEAD --count) + HEAD=$(( A + 473 )) + + # qetversion.cpp contient désormais 2 "return QVersionNumber{" (Qt5/Qt6 + # dans un #if/#else) : on cible explicitement la branche Qt6, sinon + # "grep | head -1" ne lirait que la première rencontrée dans le fichier. + VERSION=$(awk '/QT_VERSION_CHECK\(6, 0, 0\)/{f=1;next} f && /return QVersionNumber/{print;exit}' \ + "$GITHUB_WORKSPACE/sources/qetversion.cpp" \ + | awk -F '{' '{ print $2 }' \ + | awk -F '}' '{ print $1 }' \ + | sed -e 's/,/./g' -e 's/ //g') + [ -z "$VERSION" ] && VERSION="dev" + + FULL_VERSION="${VERSION}-qt6-r${HEAD}-${GITCOMMIT}_x86_64-win64" + BASE_VERSION="${VERSION}-qt6" + echo "version=$FULL_VERSION" >> "$GITHUB_OUTPUT" + echo "base_version=$BASE_VERSION" >> "$GITHUB_OUTPUT" + echo "gitcommit=$GITCOMMIT" >> "$GITHUB_OUTPUT" + echo "head=$HEAD" >> "$GITHUB_OUTPUT" + echo "VERSION : $VERSION" + echo "GITCOMMIT : $GITCOMMIT" + echo "HEAD (rev) : $HEAD" + echo "FULL : $FULL_VERSION" + + - name: Patch QET64.nsi — version + exe name + absolute paths + shell: msys2 {0} + run: | + set -euo pipefail + VERSION="${{ steps.qet_version.outputs.version }}" + NSI="$GITHUB_WORKSPACE/nsis_root/QET64.nsi" + FILES_WIN=$(cygpath -w "$GITHUB_WORKSPACE/nsis_root/files") + SCRIPT="$GITHUB_WORKSPACE/build-aux/windows/patch_nsi.py" + + python3 "$SCRIPT" "$NSI" "$VERSION" "$FILES_WIN" + + echo "=== Verification ===" + grep 'SOFT_VERSION' "$NSI" | head -1 + grep -m2 'nsis_root' "$NSI" | head -2 + echo "=== Contents of nsis_root/files/ ===" + ls "$GITHUB_WORKSPACE/nsis_root/files/" + + - name: Build NSIS installer + shell: msys2 {0} + run: | + set -euo pipefail + NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root" + cd "$NSIS_ROOT" + echo "=== CWD : $(pwd) ===" + MSYS2_ARG_CONV_EXCL="*" makensis /V4 QET64.nsi + RC=$? + echo "=== Contents of nsis_root after makensis ===" + ls "$NSIS_ROOT/" + [ $RC -eq 0 ] || { echo "ERROR: makensis failed (exit $RC)"; exit 1; } + + - name: Move installer to dist/ + shell: msys2 {0} + run: | + set -euo pipefail + mkdir -p "$GITHUB_WORKSPACE/dist" + INSTALLER=$(find "$GITHUB_WORKSPACE/nsis_root" -maxdepth 1 -iname "installer_*.exe" | head -1) + if [ -z "$INSTALLER" ]; then + echo "ERROR: no installer .exe found in nsis_root/" + ls "$GITHUB_WORKSPACE/nsis_root/" + exit 1 + fi + echo "Moving: $INSTALLER -> dist/" + mv "$INSTALLER" "$GITHUB_WORKSPACE/dist/" + + - name: Upload build logs on failure + if: failure() + uses: actions/upload-artifact@v7 + with: + name: build-logs-qt6 + path: | + build/CMakeFiles/*.log + nsis_root/files/bin/ + if-no-files-found: warn + + - name: Zip portable (readytouse) + id: zip_portable + shell: pwsh + run: | + $version = "${{ steps.qet_version.outputs.base_version }}" + $head = "${{ steps.qet_version.outputs.head }}" + $zipName = "qelectrotech-${version}+git${head}-x86-win64-readytouse.zip" + $src = "$env:GITHUB_WORKSPACE\nsis_root\files" + $dst = "$env:GITHUB_WORKSPACE\dist\$zipName" + $7z = "C:\Program Files\7-Zip\7z.exe" + + New-Item -ItemType Directory -Force -Path "$env:GITHUB_WORKSPACE\dist" | Out-Null + & $7z a -tzip -mx=5 -mmt=on $dst "$src\*" + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + + $sizeMB = [math]::Round((Get-Item $dst).Length / 1MB, 1) + Write-Output "ZIP created: $zipName ($sizeMB MB)" + "zip_name=$zipName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Upload portable (files/ without installer) + uses: actions/upload-artifact@v7 + with: + name: qelectrotech-${{ steps.qet_version.outputs.base_version }}+git${{ steps.qet_version.outputs.head }}-x86-win64-readytouse + path: dist/${{ steps.zip_portable.outputs.zip_name }} + retention-days: 14 + + - name: Upload NSIS installer + uses: actions/upload-artifact@v7 + with: + name: qelectrotech-windows-installer-qt6 + path: dist/Installer_*.exe + retention-days: 14 + + - name: Upload portable (nom scopé qt6, pour un futur workflow MSI) + uses: actions/upload-artifact@v7 + with: + name: qelectrotech-windows-portable-qt6 + path: nsis_root/files/ + retention-days: 14