diff --git a/.github/workflows/LinuxFlatpak.yml b/.github/workflows/LinuxFlatpak.yml index 6cce42e..23048dc 100644 --- a/.github/workflows/LinuxFlatpak.yml +++ b/.github/workflows/LinuxFlatpak.yml @@ -23,7 +23,7 @@ jobs: - name: Install KDE SDK and Runtime run: | - sudo flatpak install -y flathub org.kde.Sdk/x86_64/6.8 org.kde.Platform/x86_64/6.8 + sudo flatpak install -y flathub org.kde.Sdk/x86_64/6.9 org.kde.Platform/x86_64/6.9 - name: List Flatpak Installed Packages and Version run: | diff --git a/.github/workflows/LinuxInstall.yml b/.github/workflows/LinuxInstall.yml index 434e600..a703cec 100644 --- a/.github/workflows/LinuxInstall.yml +++ b/.github/workflows/LinuxInstall.yml @@ -5,13 +5,13 @@ on: jobs: build_ubuntu: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y libxcb-cursor0 + sudo apt-get install -y libxcb-cursor0 libfuse2 sudo apt-get install -y libspeechd2 sudo apt-get install -y gnupg2 wget sudo apt-get install -y appstream @@ -88,20 +88,20 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: '6.8.0' + version: '6.9.0' host: 'linux' target: 'desktop' dir: '${{ github.workspace }}/qt/' install-deps: 'true' modules: 'qtspeech qtmultimedia' cache: 'true' - cache-key-prefix: ${{ runner.os }}-qt-680 + cache-key-prefix: ${{ runner.os }}-qt-690 - name: Build Project working-directory: pdf4qt run: | cmake -B build -S . -DPDF4QT_INSTALL_QT_DEPENDENCIES=0 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VCPKG_BUILD_TYPE=Release -DVCPKG_OVERLAY_PORTS=vcpkg/overlays -DPDF4QT_INSTALL_TO_USR=ON - cmake --build build -j6 + cmake --build build --target all release_translations -j6 cmake --install build - name: Read version diff --git a/.github/workflows/WindowsInstall.yml b/.github/workflows/WindowsInstall.yml index b4ed9e1..15165a3 100644 --- a/.github/workflows/WindowsInstall.yml +++ b/.github/workflows/WindowsInstall.yml @@ -116,7 +116,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: '6.8.0' + version: '6.9.0' host: 'windows' target: 'desktop' arch: 'win64_msvc2022_64' @@ -124,7 +124,7 @@ jobs: install-deps: 'true' modules: 'qtspeech qtmultimedia qtimageformats' cache: 'true' - cache-key-prefix: ${{ runner.os }}-qt-680 + cache-key-prefix: ${{ runner.os }}-qt-690 - name: Find VC Redistributable Directories @@ -156,8 +156,9 @@ jobs: shell: pwsh run: | cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_VCPKG_BUILD_TYPE=Release -DPDF4QT_INSTALL_QT_DEPENDENCIES=ON -DPDF4QT_INSTALL_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="${env:GITHUB_WORKSPACE}\vcpkg\scripts\buildsystems\vcpkg.cmake" -DPDF4QT_QT_ROOT="${env:Qt6_DIR}" -DPDF4QT_INSTALL_MSVC_REDISTRIBUTABLE=ON -DPDF4QT_INSTALL_PREPARE_WIX_INSTALLER=ON -DPDF4QT_INSTALL_TO_USR=ON + cmake --build build --target release_translations --config Release -j6 cmake --build build --config Release -j6 - cmake --install build + cmake --install build --config Release env: VCToolsRedistDir: ${{ env.VCToolsRedistDir }} VSCMD_ARG_TGT_ARCH: ${{ env.VSCMD_ARG_TGT_ARCH }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dcb456..8dea271 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,20 +48,20 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.8.0' + version: '6.9.0' host: 'linux' target: 'desktop' dir: '${{ github.workspace }}/qt/' install-deps: 'true' modules: 'qtspeech qtmultimedia' cache: 'true' - cache-key-prefix: ${{ runner.os }}-qt-680 + cache-key-prefix: ${{ runner.os }}-qt-690 - name: Build project working-directory: pdf4qt run: | cmake -B build -S . -DPDF4QT_INSTALL_QT_DEPENDENCIES=0 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VCPKG_BUILD_TYPE=Release - cmake --build build -j6 + cmake --build build --target all release_translations --config Release -j6 cmake --install build - name: Make DEB package @@ -113,7 +113,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.8.0' + version: '6.9.0' host: 'windows' target: 'desktop' arch: 'win64_msvc2022_64' @@ -121,15 +121,17 @@ jobs: install-deps: 'true' modules: 'qtspeech qtmultimedia' cache: 'true' - cache-key-prefix: ${{ runner.os }}-qt-680 + cache-key-prefix: ${{ runner.os }}-qt-690 - name: Build project working-directory: pdf4qt shell: pwsh run: | cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_VCPKG_BUILD_TYPE=Release -DPDF4QT_INSTALL_QT_DEPENDENCIES=ON -DPDF4QT_INSTALL_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="${env:GITHUB_WORKSPACE}\vcpkg\scripts\buildsystems\vcpkg.cmake" -DPDF4QT_QT_ROOT="${env:Qt6_DIR}" -DPDF4QT_INSTALL_MSVC_REDISTRIBUTABLE=ON -DPDF4QT_INSTALL_PREPARE_WIX_INSTALLER=ON -DPDF4QT_INSTALL_TO_USR=ON + cmake --build build --target help + cmake --build build --target release_translations --config Release -j6 cmake --build build --config Release -j6 - cmake --install build + cmake --install build --config Release - name: Upload Windows package uses: actions/upload-artifact@v4 diff --git a/Flatpak/io.github.JakubMelka.Pdf4qt.json b/Flatpak/io.github.JakubMelka.Pdf4qt.json index 3409360..bf6d75c 100644 --- a/Flatpak/io.github.JakubMelka.Pdf4qt.json +++ b/Flatpak/io.github.JakubMelka.Pdf4qt.json @@ -1,7 +1,7 @@ { "app-id": "io.github.JakubMelka.Pdf4qt", "runtime": "org.kde.Sdk", - "runtime-version": "6.8", + "runtime-version": "6.9", "sdk": "org.kde.Sdk", "command": "Pdf4QtEditor", "finish-args": [ @@ -121,6 +121,10 @@ "-DPDF4QT_INSTALL_TO_USR=OFF", "-DCMAKE_VERBOSE_MAKEFILE=OFF" ], + "build-commands": [ + "ninja all", + "ninja release_translations" + ], "sources": [ { "type": "git",