CI: Bugfixing

This commit is contained in:
Jakub Melka 2023-12-10 17:26:24 +01:00
parent 38988babc5
commit d80351b2a6
1 changed files with 5 additions and 5 deletions

View File

@ -34,7 +34,7 @@ jobs:
- name: 'VCPKG: Install project dependencies'
run: |
.\vcpkg install tbb openssl lcms zlib openjpeg freetype ijg-libjpeg libpng
.\vcpkg install tbb openssl lcms zlib openjpeg freetype ijg-libjpeg libpng --triplet x64-windows
working-directory: vcpkg
- name: Install Qt
@ -50,7 +50,7 @@ jobs:
cache-key-prefix: ${{ runner.os }}-qt-660
- name: Echo CMake command
run: echo "cmake --trace -B build -S . -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 -DCMAKE_BUILD_TYPE=Release -DPDF4QT_INSTALL_TO_USR=ON"
run: echo "cmake -B build -S . -DCMAKE_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"
shell: pwsh
@ -58,12 +58,12 @@ jobs:
working-directory: pdf4qt
shell: pwsh
run: |
cmake --trace -B build -S . -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 -DCMAKE_BUILD_TYPE=Release -DPDF4QT_INSTALL_TO_USR=ON
cmake -B build -S . -DCMAKE_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 -j6
cmake --install build
- name: Make Windows ZIP package
working-directory: pdf4qt/build/usr
working-directory: pdf4qt\build\install\usr
run: |
7z a -r pdf4qt.zip bin
@ -71,5 +71,5 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: 'pdf4qt-${{ runner.os }}.zip'
path: .\pdf4qt\build\usr\*.zip
path: .\pdf4qt\build\install\usr\*.zip
retention-days: 30