Skip to content

Commit 0659394

Browse files
committed
CI: update qt version to 6.8.1 in msvc.yml
1 parent 10edbea commit 0659394

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
BUILD_TYPE: [Release]
1818
qt_arch: [android_arm64_v8a, android_x86_64]
19-
qt_version: [6.9.0]
19+
qt_version: [6.8.1]
2020
include:
2121
- qt_arch: android_arm64_v8a
2222
VCPKG_TARGET_TRIPLET: arm64-android
@@ -96,7 +96,7 @@ jobs:
9696
9797
- name: Install Qt of linux_gcc_64
9898
uses: jurplel/install-qt-action@v4
99-
if: ${{ matrix.qt_version == '6.9.0' }}
99+
if: ${{ matrix.qt_version == '6.8.1' }}
100100
with:
101101
dir: '${{env.TOOLS_DIR}}/qt' # optional
102102
version: '${{matrix.qt_version}}'

.github/workflows/msvc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
strategy:
1616
matrix:
1717
BUILD_TYPE: [Release, Debug]
18-
qt_version: [6.9.0, 5.15.2, 5.12.12]
18+
qt_version: [6.8.1, 5.15.2, 5.12.12]
1919
include:
20-
- qt_version: 6.9.0
20+
- qt_version: 6.8.1
2121
qt_arch: win64_msvc2022_64
2222
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat
2323
CMAKE_GENERATOR_PLATFORM: x64
@@ -330,7 +330,7 @@ jobs:
330330
run: git clone https://github.com/KangLin/RabbitCommon.git
331331

332332
- name: Build RabbitRemoteControl with cmake preset
333-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' && startsWith(github.ref, 'refs/heads/master')}}
333+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' && startsWith(github.ref, 'refs/heads/master')}}
334334
working-directory: ${{github.workspace}}
335335
env:
336336
RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
@@ -434,7 +434,7 @@ jobs:
434434
${{github.workspace}}\build\RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Portable.zip
435435
436436
- name: Update artifact update_windows.xml
437-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
437+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' }}
438438
uses: actions/upload-artifact@v4
439439
with:
440440
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}_xml

ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## Change Log
22

3+
### v0.0.37
4+
- Fix play is not sound in msvc
5+
36
### v0.0.36
47
- Client:
58
- Fix recode video rate bug

ChangeLog_zh_CN.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## 修改日志
22

3+
### v0.0.37
4+
- 修复播放器没有声音。 qt 6.8.2、6.8.3、6.9.0、6.9.1、6.10.0 支持 FFMPEG 有问题,所以切换到 6.8.1
5+
36
### v0.0.36
47
- Client:
58
- 修复录制视频帧率错误

deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,6 @@ if [ -n "$1" ]; then
129129
git tag -d $1
130130
git tag -a $1 -m "Release $1"
131131
#git push origin :refs/tags/$1
132-
git push
132+
#git push
133133
git push origin $1
134134
fi

0 commit comments

Comments
 (0)