Issue #261: Update Github Workflow

This commit is contained in:
Jakub Melka
2025-04-21 14:33:56 +02:00
parent 20b5e7d26c
commit 93f1977253
5 changed files with 23 additions and 16 deletions

View File

@@ -23,7 +23,7 @@ jobs:
- name: Install KDE SDK and Runtime - name: Install KDE SDK and Runtime
run: | 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 - name: List Flatpak Installed Packages and Version
run: | run: |

View File

@@ -5,13 +5,13 @@ on:
jobs: jobs:
build_ubuntu: build_ubuntu:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update 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 libspeechd2
sudo apt-get install -y gnupg2 wget sudo apt-get install -y gnupg2 wget
sudo apt-get install -y appstream sudo apt-get install -y appstream
@@ -88,20 +88,20 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: '6.8.0' version: '6.9.0'
host: 'linux' host: 'linux'
target: 'desktop' target: 'desktop'
dir: '${{ github.workspace }}/qt/' dir: '${{ github.workspace }}/qt/'
install-deps: 'true' install-deps: 'true'
modules: 'qtspeech qtmultimedia' modules: 'qtspeech qtmultimedia'
cache: 'true' cache: 'true'
cache-key-prefix: ${{ runner.os }}-qt-680 cache-key-prefix: ${{ runner.os }}-qt-690
- name: Build Project - name: Build Project
working-directory: pdf4qt working-directory: pdf4qt
run: | 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 -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 cmake --install build
- name: Read version - name: Read version

View File

@@ -116,7 +116,7 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: '6.8.0' version: '6.9.0'
host: 'windows' host: 'windows'
target: 'desktop' target: 'desktop'
arch: 'win64_msvc2022_64' arch: 'win64_msvc2022_64'
@@ -124,7 +124,7 @@ jobs:
install-deps: 'true' install-deps: 'true'
modules: 'qtspeech qtmultimedia qtimageformats' modules: 'qtspeech qtmultimedia qtimageformats'
cache: 'true' cache: 'true'
cache-key-prefix: ${{ runner.os }}-qt-680 cache-key-prefix: ${{ runner.os }}-qt-690
- name: Find VC Redistributable Directories - name: Find VC Redistributable Directories
@@ -156,8 +156,9 @@ jobs:
shell: pwsh shell: pwsh
run: | 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 -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 --build build --config Release -j6
cmake --install build cmake --install build --config Release
env: env:
VCToolsRedistDir: ${{ env.VCToolsRedistDir }} VCToolsRedistDir: ${{ env.VCToolsRedistDir }}
VSCMD_ARG_TGT_ARCH: ${{ env.VSCMD_ARG_TGT_ARCH }} VSCMD_ARG_TGT_ARCH: ${{ env.VSCMD_ARG_TGT_ARCH }}

View File

@@ -48,20 +48,20 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: '6.8.0' version: '6.9.0'
host: 'linux' host: 'linux'
target: 'desktop' target: 'desktop'
dir: '${{ github.workspace }}/qt/' dir: '${{ github.workspace }}/qt/'
install-deps: 'true' install-deps: 'true'
modules: 'qtspeech qtmultimedia' modules: 'qtspeech qtmultimedia'
cache: 'true' cache: 'true'
cache-key-prefix: ${{ runner.os }}-qt-680 cache-key-prefix: ${{ runner.os }}-qt-690
- name: Build project - name: Build project
working-directory: pdf4qt working-directory: pdf4qt
run: | 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 -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 cmake --install build
- name: Make DEB package - name: Make DEB package
@@ -113,7 +113,7 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: '6.8.0' version: '6.9.0'
host: 'windows' host: 'windows'
target: 'desktop' target: 'desktop'
arch: 'win64_msvc2022_64' arch: 'win64_msvc2022_64'
@@ -121,15 +121,17 @@ jobs:
install-deps: 'true' install-deps: 'true'
modules: 'qtspeech qtmultimedia' modules: 'qtspeech qtmultimedia'
cache: 'true' cache: 'true'
cache-key-prefix: ${{ runner.os }}-qt-680 cache-key-prefix: ${{ runner.os }}-qt-690
- name: Build project - name: Build project
working-directory: pdf4qt working-directory: pdf4qt
shell: pwsh shell: pwsh
run: | 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 -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 --build build --config Release -j6
cmake --install build cmake --install build --config Release
- name: Upload Windows package - name: Upload Windows package
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View File

@@ -1,7 +1,7 @@
{ {
"app-id": "io.github.JakubMelka.Pdf4qt", "app-id": "io.github.JakubMelka.Pdf4qt",
"runtime": "org.kde.Sdk", "runtime": "org.kde.Sdk",
"runtime-version": "6.8", "runtime-version": "6.9",
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"command": "Pdf4QtEditor", "command": "Pdf4QtEditor",
"finish-args": [ "finish-args": [
@@ -121,6 +121,10 @@
"-DPDF4QT_INSTALL_TO_USR=OFF", "-DPDF4QT_INSTALL_TO_USR=OFF",
"-DCMAKE_VERBOSE_MAKEFILE=OFF" "-DCMAKE_VERBOSE_MAKEFILE=OFF"
], ],
"build-commands": [
"ninja all",
"ninja release_translations"
],
"sources": [ "sources": [
{ {
"type": "git", "type": "git",