Compare commits

..

No commits in common. "c227c74e233f46660bb6ceb3be9c2c461bc0387f" and "2de9ff810d11334bb5e35df89f4a765ce19ca7f4" have entirely different histories.

2 changed files with 9 additions and 19 deletions

View File

@ -14,25 +14,15 @@ jobs:
with: with:
version: '6.8.1' version: '6.8.1'
modules: 'qtimageformats' modules: 'qtimageformats'
- name: Install Conan and Dependencies - name: Run a qt project
id: conan
working-directory: ./
shell: bash
run: | run: |
pip3 install wheel setuptools cmake . -Bbuild -DTRANSLATION_RESOURCE_EMBEDDING=ON
pip3 install conan --upgrade cmake --build build
conan --version
conan profile detect
conan install --requires=exiv2/0.28.3 --generator CMakeDeps --generator CMakeToolchain --build=missing
- name: Build
run: |
cmake . -DTRANSLATION_RESOURCE_EMBEDDING=ON --preset conan-release
cmake --build --preset conan-release
- name: Deploy - name: Deploy
run: | run: |
macdeployqt ./ppic.app -dmg macdeployqt ./build/ppic.app -dmg
ls ls
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: "macos-bundle" name: "macos-bundle"
path: "*.dmg" path: build/*.dmg

View File

@ -8,9 +8,9 @@ environment:
LIBEXIV2: C:\projects\exiv2 LIBEXIV2: C:\projects\exiv2
PPKG: C:\projects\ppkg PPKG: C:\projects\ppkg
matrix: matrix:
- job_name: mingw_64_qt6_8 - job_name: mingw_64_qt6_7
QTDIR: C:\Qt\6.8\mingw_64 QTDIR: C:\Qt\6.7\mingw_64
MINGW64: C:\Qt\Tools\mingw1310_64 MINGW64: C:\Qt\Tools\mingw1120_64
KF_BRANCH: master KF_BRANCH: master
EXIV2_VERSION: "0.28.3" EXIV2_VERSION: "0.28.3"
EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF" EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF"
@ -125,7 +125,7 @@ build_script:
- cd kimageformats - cd kimageformats
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -G "Ninja" -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_QTPLUGINDIR=%QTDIR%\plugins - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_QTPLUGINDIR=%QTDIR%\plugins
- cmake --build . --config Release - cmake --build . --config Release
- cmake --build . --config Release --target install/strip - cmake --build . --config Release --target install/strip
- cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%