Skip to content

Commit be49cab

Browse files
committed
CI: modify ci
1 parent 9adad68 commit be49cab

File tree

21 files changed

+59
-57
lines changed

21 files changed

+59
-57
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
ANDROID_PLATFORM: android-35
4343
ANDROID_NATIVE_API_LEVEL: 35
4444
qt_modules: 'qtscxml qtserialport'
45-
SerialPortAssistant_VERSION: v0.5.29
45+
SerialPortAssistant_VERSION: v0.5.30
4646

4747
# Map the job outputs to step outputs
4848
outputs:

.github/workflows/appimage.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}
3939
artifact_name: build_appimage_${{matrix.os}}
4040
qt_modules: 'qtscxml'
41-
SerialPortAssistant_VERSION: v0.5.29
41+
SerialPortAssistant_VERSION: v0.5.30
4242

4343
# Map the job outputs to step outputs
4444
outputs:
@@ -98,7 +98,7 @@ jobs:
9898
run: |
9999
export QMAKE=/usr/bin/qmake6
100100
${{github.workspace}}/Script/build_appimage.sh
101-
md5sum SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_`uname -m`.AppImage > ../SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_`uname -m`.AppImage.md5sum
101+
md5sum SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_`uname -m`.AppImage > SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_`uname -m`.AppImage.md5sum
102102
103103
- name: update configure file
104104
if: ${{ matrix.BUILD_TYPE == 'Release'}}
@@ -112,13 +112,13 @@ jobs:
112112
export QT_XCB_GL_INTEGRATION=none
113113
#export QT_DEBUG_PLUGINS=1
114114
ARCH=`uname -m`
115-
MD5SUM=`cat SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_$ARCH.AppImage.md5sum|awk '{print $1}'`
116-
echo "MD5SUM SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_$ARCH.AppImage: ${MD5SUM}"
115+
MD5SUM=`cat SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_$ARCH.AppImage.md5sum|awk '{print $1}'`
116+
echo "MD5SUM SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_$ARCH.AppImage: ${MD5SUM}"
117117
echo "Generate update configure file ......"
118-
./SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_$ARCH.AppImage \
118+
./SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_$ARCH.AppImage \
119119
-f "${{github.workspace}}/update_appimage_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.json" \
120120
--foc 1 \
121-
--file-name SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_$ARCH.AppImage \
121+
--file-name SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_$ARCH.AppImage \
122122
-u "https://github.com/KangLin/SerialPortAssistant/releases/download/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${ARCH}.AppImage;https://sourceforge.net/projects/SerialPortAssistant/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${ARCH}.AppImage?viasf=1" \
123123
--md5 "${MD5SUM}" \
124124
-m "v${{env.SerialPortAssistant_VERSION}}"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@ jobs:
110110
- name: Upload To Github Release
111111
if: ${{ startsWith(github.ref, 'refs/tags/') }}
112112
run: |
113-
gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Release.md
113+
gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Release.md || \
114114
gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{env.artifact_path}}/* ${{github.workspace}}/Release.md ${{ github.workspace }}/update.json

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
qt_modules: ${{matrix.qt_modules}}
4444
artifact_name: build_macos
4545
VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
46-
SerialPortAssistant_VERSION: 0.5.29
46+
SerialPortAssistant_VERSION: 0.5.30
4747

4848
# Map the job outputs to step outputs
4949
outputs:

.github/workflows/mingw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
SOURCE_DIR: ${{github.workspace}}\.cache\source
3131
TOOLS_DIR: ${{github.workspace}}\.cache\tools
3232
INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw
33-
SerialPortAssistant_VERSION: v0.5.29
33+
SerialPortAssistant_VERSION: v0.5.30
3434
artifact_name: build_mingw
3535

3636
# Map the job outputs to step outputs

.github/workflows/msvc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: windows-latest
4343

4444
env:
45-
SerialPortAssistant_VERSION: v0.5.29
45+
SerialPortAssistant_VERSION: v0.5.30
4646
BUILD_DIR: ${{github.workspace}}/build
4747
SOURCE_DIR: ${{github.workspace}}\.cache\source
4848
TOOLS_DIR: ${{github.workspace}}\.cache\tools

.github/workflows/ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
TOOLS_DIR: ${{github.workspace}}/.cache/tools
3131
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.BUILD_TYPE}}
3232
artifact_name: build_${{matrix.os}}
33-
SerialPortAssistant_VERSION: 0.5.29
33+
SerialPortAssistant_VERSION: 0.5.30
3434

3535
# Map the job outputs to step outputs
3636
outputs:
@@ -99,7 +99,7 @@ jobs:
9999
echo "# sudo sysctl -w kernel.core_pattern=core"
100100
sudo sysctl -w kernel.core_pattern=${{github.workspace}}/core
101101
/opt/SerialPortAssistant/bin/SerialPortAssistant.sh \
102-
-f "`pwd`/update_ubuntu.json" \
102+
-f "`pwd`/update_ubuntu_${OS_NAME}_${ARCH}.json" \
103103
--foc 1 \
104104
--md5 ${MD5} \
105105
-m "${{env.SerialPortAssistant_VERSION}}" \
@@ -124,5 +124,5 @@ jobs:
124124
name: ${{ env.artifact_name }}
125125
path: |
126126
${{github.workspace}}/serialportassistant_${{env.SerialPortAssistant_VERSION}}_${OS_NAME}_${ARCH}.deb
127-
${{github.workspace}}/update_ubuntu.json
127+
${{github.workspace}}/update_*.json
128128
${{github.workspace}}/version.json

App/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endif()
2828
GET_VERSION(OUT_VERSION SerialPortAssistant_VERSION
2929
OUT_REVISION SerialPortAssistant_Revision)
3030
IF(NOT SerialPortAssistant_VERSION)
31-
SET(SerialPortAssistant_VERSION "0.5.29")
31+
SET(SerialPortAssistant_VERSION "0.5.30")
3232
ENDIF()
3333
message("SerialPortAssistant_VERSION:${SerialPortAssistant_VERSION};Revision:${SerialPortAssistant_Revision}")
3434

App/android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.KangLinStudio.SerialPortAssistant" android:installLocation="auto" android:versionCode="0" android:versionName="0.5.29" >
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.KangLinStudio.SerialPortAssistant" android:installLocation="auto" android:versionCode="0" android:versionName="0.5.30" >
33

44
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
55
<uses-permission android:name="android.permission.INTERNET"/>

ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## Change log
2+
23
- Version: v0.5.30
34
- Remove donate bitcoin
45
- Add build script

0 commit comments

Comments
 (0)