From b3a353b338dd5aaab3a23440f3eacdc45681bd54 Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Tue, 20 Feb 2024 13:04:05 +0800 Subject: [PATCH] Release v0.5.19 --- .github/workflows/android.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- App/android/AndroidManifest.xml | 2 +- ChangeLog.md | 3 +++ ChangeLog_zh_CN.md | 3 +++ Install/Install.nsi | 2 +- README.md | 4 ++-- README_zh_CN.md | 4 ++-- Update/update.json | 2 +- appveyor.yml | 9 +++++---- debian/changelog | 15 +++++++-------- deploy.sh | 2 +- 15 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6b0d4c50..c74c5148 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,7 +32,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install - SerialPortAssistant_VERSION: v0.5.18 + SerialPortAssistant_VERSION: v0.5.19 VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d39b123f..e0939e7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SerialPortAssistant_VERSION: v0.5.18 + SerialPortAssistant_VERSION: v0.5.19 on: push: diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index c22faa8b..79f938f4 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -26,7 +26,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.18 + SerialPortAssistant_VERSION: v0.5.19 artifact_name: build_mingw # Map the job outputs to step outputs diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 07b42c5e..fa06cd95 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -42,7 +42,7 @@ jobs: CMAKE_GENERATOR: "Visual Studio 17 2022" VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} - SerialPortAssistant_VERSION: v0.5.18 + SerialPortAssistant_VERSION: v0.5.19 VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 qt_modules: qtwebengine ${{matrix.qt_modules}} artifact_name: build_msvc diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 593ce1d4..f6062613 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -22,7 +22,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.18 + SerialPortAssistant_VERSION: 0.5.19 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml index 95945a0e..ab4fa793 100644 --- a/App/android/AndroidManifest.xml +++ b/App/android/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.KangLinStudio.SerialPortAssistant" android:installLocation="auto" android:versionCode="1" - android:versionName="0.5.18" > + android:versionName="0.5.19" > diff --git a/ChangeLog.md b/ChangeLog.md index a161d939..3943b219 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ ++ Version: v0.5.19 + - Modify ci to windows xp + + Version: v0.5.18 - Modify UI diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md index 13741e75..e581de7e 100644 --- a/ChangeLog_zh_CN.md +++ b/ChangeLog_zh_CN.md @@ -1,3 +1,6 @@ ++ 版本: v0.5.19 + - 修改自动化编译生成 windows xp 版本 + + 版本: v0.5.18 - 修改界面 diff --git a/Install/Install.nsi b/Install/Install.nsi index 9c8321f4..3ab56d27 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.18" +!define PRODUCT_VERSION "v0.5.19" !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 b3becd5a..375ea262 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,9 @@ Author: Kang Lin (kl222@126.com) - Install - ubuntu - sudo apt install ./serialportassistant_0.5.18_amd64.deb + sudo apt install ./serialportassistant_0.5.19_amd64.deb # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i serialportassistant_0.5.18_amd64.deb + # sudo dpkg -i serialportassistant_0.5.19_amd64.deb # sudo apt-get install -f # Install dependencies ## Donate diff --git a/README_zh_CN.md b/README_zh_CN.md index e00879b5..8753741e 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -57,9 +57,9 @@ - 安装说明： - ubuntu - sudo apt install ./serialportassistant_0.5.18_amd64.deb + sudo apt install ./serialportassistant_0.5.19_amd64.deb # 如果你是老的 Linux 发行系统。你需要用下列命令替换： - # sudo dpkg -i serialportassistant_0.5.18_amd64.deb + # sudo dpkg -i serialportassistant_0.5.19_amd64.deb # sudo apt-get install -f # Install dependencies ### 捐赠 diff --git a/Update/update.json b/Update/update.json index 3a649a5b..27b5d2af 100644 --- a/Update/update.json +++ b/Update/update.json @@ -1,7 +1,7 @@ { "redirect": [ { - "version":"v0.5.18" + "version":"v0.5.19" } ] } diff --git a/appveyor.yml b/appveyor.yml index 65cc2875..63666535 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,12 @@ -version: 'v0.5.18.{build}' +version: 'v0.5.19.{build}' cache: - - C:\projects\other_source + - ..\other_source +# Clean cached +# https://www.appveyor.com/docs/build-cache/#cleaning-up-cache environment: + SerialPortAssistant_VERSION: "v0.5.19" STOREPASS: secure: l9BZEU39F1a4vSkhwl0CHR+yh6CD1c7byGzMv+1NUa4= QT_USER: @@ -35,7 +38,6 @@ init: - if NOT "%QT_ROOT%" == "NO" for /f "delims=" %%i in ('%QT_ROOT%/bin/qmake -query QT_VERSION') do (set QT_VERSION=%%i) - echo QT_ROOT=%QT_ROOT% - echo QT_VERSION=%QT_VERSION% - - set SerialPortAssistant_VERSION=v0.5.18 install: - cd %APPVEYOR_BUILD_FOLDER% @@ -102,7 +104,6 @@ deploy: draft: true prerelease: true on: - BUILD_TARGERT: windows_msvc TOOLCHAIN_VERSION: 14 QT_VERSION: 5.6.3 BUILD_ARCH: x86 diff --git a/debian/changelog b/debian/changelog index f7f5b1d4..0de94c0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,10 @@ -serialportassistant (0.5.18) stable; urgency=medium +serialportassistant (0.5.19) stable; urgency=medium - * Fix windows title - * Modify translations - * Modify UI - * CI: modify ci - * Modify deploy.sh to disable update.xml - * Modify README + * CI: modify appveyor.yml + * CI: remove appveyor.yml + * Modify etc/SerialPortAssistant_logqt.ini + * CI: fix urls bug in macos.yml + * CI: remove xml - -- Kang Lin Wed, 07 Feb 2024 12:32:58 +0800 + -- Kang Lin Tue, 20 Feb 2024 13:04:05 +0800 diff --git a/deploy.sh b/deploy.sh index f9ea4d81..848f455c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -45,7 +45,7 @@ sed -i "s/^\!define PRODUCT_VERSION.*/\!define PRODUCT_VERSION \"${VERSION}\"/g" APPVERYOR_VERSION="version: '${VERSION}.{build}'" sed -i "s/^version: '.*{build}'/${APPVERYOR_VERSION}/g" ${SOURCE_DIR}/appveyor.yml -sed -i "s/SerialPortAssistant_VERSION=.*/SerialPortAssistant_VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/appveyor.yml +sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: \"${VERSION}\"/g" ${SOURCE_DIR}/appveyor.yml #sed -i "s/export VERSION=.*/export VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/.travis.yml #sed -i "s/^\ - export VERSION=.*/\ - export VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/.travis.yml