3 Commits

Author SHA1 Message Date
9c8ffb6c1b chore(CI): bump Qt and action version 2026-04-04 16:52:18 +08:00
4c5c5e6fc6 fix(CI): zlib dll renamed 2026-03-27 17:55:23 +08:00
b8cb10bb33 fix(CI): fixed kf6 version for appveyor build 2026-03-27 15:52:00 +08:00
5 changed files with 15 additions and 15 deletions

View File

@@ -14,7 +14,7 @@ jobs:
run: | run: |
apt update apt update
apt install -y git ca-certificates curl file apt install -y git ca-certificates curl file
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Get build dept. - name: Get build dept.
run: | run: |
apt install -y cmake qt6-base-dev qt6-svg-dev qt6-tools-dev libexiv2-dev apt install -y cmake qt6-base-dev qt6-svg-dev qt6-tools-dev libexiv2-dev
@@ -29,7 +29,7 @@ jobs:
run: | run: |
cd build cd build
apt install -y ./*.deb apt install -y ./*.deb
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: deepin-25-deb-package name: deepin-25-deb-package
path: build/*.deb path: build/*.deb

View File

@@ -8,11 +8,11 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: '6.10.2' version: '6.10.3'
modules: 'qtimageformats' modules: 'qtimageformats'
cache: true cache: true
- name: Install Conan and Dependencies - name: Install Conan and Dependencies
@@ -33,7 +33,7 @@ jobs:
run: | run: |
macdeployqt ./ppic.app -dmg macdeployqt ./ppic.app -dmg
ls ls
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: "macos-bundle" name: "macos-bundle"
path: "*.dmg" path: "*.dmg"

View File

@@ -6,7 +6,7 @@ jobs:
ubuntu-24-04-build: ubuntu-24-04-build:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Get build dept. - name: Get build dept.
run: | run: |
sudo apt update sudo apt update
@@ -22,7 +22,7 @@ jobs:
run: | run: |
cd build cd build
sudo apt install ./*.deb sudo apt install ./*.deb
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: ubuntu-24.04-deb-package name: ubuntu-24.04-deb-package
path: build/*.deb path: build/*.deb

View File

@@ -8,7 +8,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_ver: '6.10.2' - qt_ver: '6.10.3'
vs: '2022' vs: '2022'
aqt_arch: 'win64_msvc2022_64' aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64' msvc_arch: 'x64'
@@ -16,7 +16,7 @@ jobs:
runs-on: windows-2022 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
@@ -35,7 +35,7 @@ jobs:
nmake nmake
nmake clean nmake clean
windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation release\ppic.exe windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation release\ppic.exe
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-qmake-package" name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-qmake-package"
path: release/* path: release/*
@@ -45,7 +45,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_ver: '6.10.2' - qt_ver: '6.10.3'
vs: '2022' vs: '2022'
aqt_arch: 'win64_msvc2022_64' aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64' msvc_arch: 'x64'
@@ -53,7 +53,7 @@ jobs:
runs-on: windows-2022 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
@@ -135,7 +135,7 @@ jobs:
if ErrorLevel 8 (exit /B 1) if ErrorLevel 8 (exit /B 1)
copy LICENSE build\bin copy LICENSE build\bin
exit /B 0 exit /B 0
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-cmake-package" name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-cmake-package"
path: build/bin/* path: build/bin/*

View File

@@ -11,7 +11,7 @@ environment:
- job_name: mingw_64_qt6_8 - job_name: mingw_64_qt6_8
QTDIR: C:\Qt\6.8\mingw_64 QTDIR: C:\Qt\6.8\mingw_64
MINGW64: C:\Qt\mingw_64\Tools\mingw1310_64 MINGW64: C:\Qt\mingw_64\Tools\mingw1310_64
KF_BRANCH: master KF_BRANCH: v6.24.0
EXIV2_VERSION: "0.28.7" EXIV2_VERSION: "0.28.7"
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"
PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF" PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF"
@@ -134,7 +134,7 @@ build_script:
- copy %CMAKE_INSTALL_PREFIX%\bin\libexpat-1.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libexpat-1.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libexiv2.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libexiv2.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libavif.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libavif.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libzlib.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libz.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libKF?Archive.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libKF?Archive.dll
- windeployqt %WINDEPLOYQT_ARGS% .\ppic.exe - windeployqt %WINDEPLOYQT_ARGS% .\ppic.exe
# copy 3rdparty licenses for the libs we vendored for windows... # copy 3rdparty licenses for the libs we vendored for windows...