diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 4ceaffbc..52e57d22 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -34,7 +34,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install - SerialPortAssistant_VERSION: v0.5.28 + SerialPortAssistant_VERSION: v0.5.29 VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}} VCPKG_DEFAULT_HOST_TRIPLET: x64-linux diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 37d47c60..e80e3544 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -27,7 +27,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install - SerialPortAssistant_VERSION: v0.0.31 + SerialPortAssistant_VERSION: v0.5.29 artifact_name: build_appimage # Map the job outputs to step outputs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c51d4b32..002fa4eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SerialPortAssistant_VERSION: v0.5.28 + SerialPortAssistant_VERSION: v0.5.29 on: push: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 81934059..c26060a3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,7 @@ jobs: TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_macos qt_modules: ${{matrix.qt_modules}} - SerialPortAssistant_VERSION: 0.5.28 + SerialPortAssistant_VERSION: 0.5.29 artifact_name: build_macos VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 91aba8c6..057b09ec 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -30,7 +30,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}\.cache\source TOOSL_DIR: ${{github.workspace}}\.cache\tools INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw - SerialPortAssistant_VERSION: v0.5.28 + SerialPortAssistant_VERSION: v0.5.29 artifact_name: build_mingw # Map the job outputs to step outputs diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 6e75d0b6..80ec6d18 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -42,7 +42,7 @@ jobs: runs-on: windows-latest env: - SerialPortAssistant_VERSION: v0.5.28 + SerialPortAssistant_VERSION: v0.5.29 SOURCE_DIR: ${{github.workspace}}\.cache\source TOOSL_DIR: ${{github.workspace}}\.cache\tools INSTALL_DIR: ${{github.workspace}}\.cache\install_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index eb7064e1..75391662 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu_${{matrix.BUILD_TYPE}} - SerialPortAssistant_VERSION: 0.5.28 + SerialPortAssistant_VERSION: 0.5.29 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt index 20a6649a..414bb4c5 100644 --- a/App/CMakeLists.txt +++ b/App/CMakeLists.txt @@ -28,7 +28,7 @@ endif() GET_VERSION(OUT_VERSION SerialPortAssistant_VERSION OUT_REVISION SerialPortAssistant_Revision) IF(NOT SerialPortAssistant_VERSION) - SET(SerialPortAssistant_VERSION "0.5.28") + SET(SerialPortAssistant_VERSION "0.5.29") ENDIF() message("SerialPortAssistant_VERSION:${SerialPortAssistant_VERSION};Revision:${SerialPortAssistant_Revision}") diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml index c0d32fb0..f4121871 100644 --- a/App/android/AndroidManifest.xml +++ b/App/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/Install/Install.nsi b/Install/Install.nsi index 3e382aa7..740fee32 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "SerialPortAssistant" -!define PRODUCT_VERSION "v0.5.28" +!define PRODUCT_VERSION "v0.5.29" !define PRODUCT_PUBLISHER "KangLin studio" !define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe" diff --git a/README.md b/README.md index d7b540b9..df0c6afa 100644 --- a/README.md +++ b/README.md @@ -65,25 +65,26 @@ Author: Kang Lin (kl222@126.com) - Install - ubuntu - - [serialportassistant_0.5.28_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/serialportassistant_0.5.28_amd64.deb) + - [serialportassistant_0.5.29_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/serialportassistant_0.5.29_amd64.deb) - sudo apt install ./serialportassistant_0.5.28_amd64.deb - # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i serialportassistant_0.5.28_amd64.deb - # sudo apt-get install -f # Install dependencies + sudo apt install ./serialportassistant_0.5.29_amd64.deb + # If you're on an older Linux distribution, you will need to run this instead: + # sudo dpkg -i serialportassistant_0.5.29_amd64.deb + # sudo apt-get install -f # Install dependencies + - AppImage + - [SerialPortAssistant_v0.5.29_x86_64.AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_x86_64.AppImage) - Windows - Windows xp - - [SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe) + - [SerialPortAssistant_v0.5.29_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_windows_xp_x86_Setup.exe) - Windows 7 or later - - [SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe) + - [SerialPortAssistant_v0.5.29_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_win32_msvc2017_qt5.12.12_Setup.exe) - Windows 10 (1809 or later) - - [SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.2_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.2_Setup.exe) + - [SerialPortAssistant_v0.5.29_win64_msvc2022_64_qt6.8.2_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_win64_msvc2022_64_qt6.8.2_Setup.exe) - Android 9 or later - - [SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.2_Release.apk) - - [SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.2_Release.apk) + - [SerialPortAssistant_v0.5.29_android_arm64_v8a_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_android_arm64_v8a_qt6.8.2_Release.apk) + - [SerialPortAssistant_v0.5.29_android_x86_64_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_android_x86_64_qt6.8.2_Release.apk) ## Donate diff --git a/README_zh_CN.md b/README_zh_CN.md index c0c95fbd..2efa8a93 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -59,25 +59,26 @@ - 安装说明: - ubuntu - - [serialportassistant_0.5.28_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/serialportassistant_0.5.28_amd64.deb) - - sudo apt install ./serialportassistant_0.5.28_amd64.deb - # 如果你是老的 Linux 发行系统。你需要用下列命令替换: - # sudo dpkg -i serialportassistant_0.5.28_amd64.deb - # sudo apt-get install -f # Install dependencies - + - [serialportassistant_0.5.29_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/serialportassistant_0.5.29_amd64.deb) + + sudo apt install ./serialportassistant_0.5.29_amd64.deb + # 如果你是老的 Linux 发行系统。你需要用下列命令替换: + # sudo dpkg -i serialportassistant_0.5.29_amd64.deb + # sudo apt-get install -f # Install dependencies + + - AppImage + - [SerialPortAssistant_v0.5.29_x86_64.AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_x86_64.AppImage) - Windows - Windows xp - - [SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe) + - [SerialPortAssistant_v0.5.29_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_windows_xp_x86_Setup.exe) - Windows 7 及以后 - - [SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe) + - [SerialPortAssistant_v0.5.29_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_win32_msvc2017_qt5.12.12_Setup.exe) - Windows 10 (1809 及以后) - - [SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.2_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.2_Setup.exe) + - [SerialPortAssistant_v0.5.29_win64_msvc2022_64_qt6.8.2_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_win64_msvc2022_64_qt6.8.2_Setup.exe) - Android 9 及以后 - - [SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.2_Release.apk) - - [SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.2_Release.apk) + - [SerialPortAssistant_v0.5.29_android_arm64_v8a_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_android_arm64_v8a_qt6.8.2_Release.apk) + - [SerialPortAssistant_v0.5.29_android_x86_64_qt6.8.2_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.29/SerialPortAssistant_v0.5.29_android_x86_64_qt6.8.2_Release.apk) ### 捐赠 如果你用得满意,可以对本人进行捐赠 diff --git a/Update/update.json b/Update/update.json index b356edd2..d4a85a79 100644 --- a/Update/update.json +++ b/Update/update.json @@ -1,7 +1,7 @@ { "redirect": [ { - "version":"v0.5.28" + "version":"v0.5.29" } ] } diff --git a/appveyor.yml b/appveyor.yml index 07c5372f..cee36fa9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 'v0.5.28.{build}' +version: 'v0.5.29.{build}' cache: - ..\other_source @@ -6,7 +6,7 @@ cache: # https://www.appveyor.com/docs/build-cache/#cleaning-up-cache environment: - SerialPortAssistant_VERSION: "v0.5.28" + SerialPortAssistant_VERSION: "v0.5.29" STOREPASS: secure: l9BZEU39F1a4vSkhwl0CHR+yh6CD1c7byGzMv+1NUa4= QT_USER: diff --git a/debian/changelog b/debian/changelog index 2a388a8f..af034d72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ -serialportassistant (0.5.28) stable; urgency=medium +serialportassistant (0.5.29) stable; urgency=medium - * Modify README + * CI: update qt6.8.1 to qt6.8.2 + * CI: modify ci + * CMake: replace RabbitCommon_DIR with RabbitCommon_ROOT + * CMake: Add RabbitCommon dependencies + * CI: add build appimage + * CI: modify build.yml + * Donate: add bitcoin + * CI: modify mingw - -- Kang Lin Sat, 07 Dec 2024 11:29:01 +0800 + -- Kang Lin Wed, 05 Feb 2025 16:04:29 +0800 diff --git a/deploy.sh b/deploy.sh index 74e45e0c..ee0de2ec 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Author: Kang Lin set -e @@ -22,8 +23,7 @@ if [ -n "$1" ]; then echo "Please check the follow list:" echo " - Test is ok ?" echo " - Translation is ok ?" - echo " - Setup file is ok ?" - echo " - Update_*.xml is ok ?" + echo " - Change log is ok ?" read -t 30 -p "Be sure to input Y, not input N: " INPUT if [ "$INPUT" != "Y" -a "$INPUT" != "y" ]; then @@ -51,6 +51,7 @@ sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: \"${VERSIO #sed -i "s/^\ - export VERSION=.*/\ - export VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/.travis.yml sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/build.yml +sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/appimage.yml sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/msvc.yml sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/mingw.yml sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/android.yml diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 33d79850..24d91090 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -4,7 +4,7 @@ # Debugging snaps: https://snapcraft.io/docs/debug-snaps name: serialportassistant base: core22 # the base snap is the execution environment for this snap -version: '0.5.28' +version: '0.5.29' type: app license: GPL-3.0+ contact: kl222@126.com diff --git a/vcpkg.json b/vcpkg.json index d1e45ffa..f81a11fa 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "serialportassistant", - "version-string": "0.5.28", + "version-string": "0.5.29", "license": "GPL-3.0", "homepage": "https://github.com/KangLin/SerialPortAssistant",