From 71fa2abd229e692664a5b7b48f9922c04215fc23 Mon Sep 17 00:00:00 2001 From: dail8859 Date: Tue, 22 Sep 2026 19:44:20 -0400 Subject: [PATCH] Drop building with Qt6.5 --- .github/workflows/build.yml | 26 +++----------------------- .github/workflows/lupdate.yml | 2 +- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a4babcd6..a315d37d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: pull_request: env: - QT_RELEASE_VER: 6.5 + QT_RELEASE_VER: 6.8 jobs: build: @@ -19,9 +19,6 @@ jobs: matrix: include: # ─── Windows ─────────────────────────────────────────────── - - os: windows-2022 - platform: windows - qt_version: "6.5" - os: windows-2022 platform: windows qt_version: "6.8" @@ -44,9 +41,6 @@ jobs: artifact_suffix: -arm64 # ─── Linux ───────────────────────────────────────────────── - - os: ubuntu-24.04 - platform: linux - qt_version: "6.5" - os: ubuntu-24.04 platform: linux qt_version: "6.8" @@ -55,13 +49,6 @@ jobs: qt_version: "6.10" # ─── macOS Intel (x64) ───────────────────────────────────── - - os: macos-15-intel - platform: mac - arch: x64 - cmake_arch: x86_64 - qt_arch: clang_64 - qt_version: "6.5" - deployment_target: "11.0" - os: macos-15-intel platform: mac arch: x64 @@ -78,13 +65,6 @@ jobs: deployment_target: "13.0" # ─── macOS Apple Silicon (arm64) ─────────────────────────── - - os: macos-15 - platform: mac - arch: arm64 - cmake_arch: arm64 - qt_arch: clang_64 - qt_version: "6.5" - deployment_target: "12.0" - os: macos-15 platform: mac arch: arm64 @@ -243,12 +223,12 @@ jobs: - name: Upload Windows arm64 Installer run: | - mv NotepadNext-Windows-Qt$QT_ARM64_RELEASE_VER-arm64-Installer/NotepadNext-${{ github.ref_name }}-Installer.exe NotepadNext-${{ github.ref_name }}-Installer-arm64.exe + mv NotepadNext-Windows-Qt$QT_RELEASE_VER-arm64-Installer/NotepadNext-${{ github.ref_name }}-Installer.exe NotepadNext-${{ github.ref_name }}-Installer-arm64.exe gh release upload ${{ github.ref_name }} NotepadNext-${{ github.ref_name }}-Installer-arm64.exe - name: Upload Windows arm64 Zip run: | - cd NotepadNext-Windows-Qt$QT_ARM64_RELEASE_VER-arm64-Zip/ + cd NotepadNext-Windows-Qt$QT_RELEASE_VER-arm64-Zip/ zip -r ../NotepadNext-${{ github.ref_name }}-win64-arm64.zip . cd .. gh release upload ${{ github.ref_name }} NotepadNext-${{ github.ref_name }}-win64-arm64.zip diff --git a/.github/workflows/lupdate.yml b/.github/workflows/lupdate.yml index a79aa3acd..10a1d7f1c 100644 --- a/.github/workflows/lupdate.yml +++ b/.github/workflows/lupdate.yml @@ -18,7 +18,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.5' + version: '6.8' modules: 'qt5compat' cache: true