Skip to content

Commit 1ed9b0d

Browse files
committed
update:test ci and configure
1 parent 589e3f9 commit 1ed9b0d

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

.github/workflows/Rocky_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: rocky build workflows
33
on:
44
push:
55
branches:
6-
- 'develop'
6+
- develop1
77
paths:
88
- 'XEngine_Source/**'
99
- 'XEngine_Release/**'

.github/workflows/macbuild.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,12 @@ jobs:
8181
run: |
8282
cd XEngine_Release
8383
brew install llvm
84-
lldb --batch -o "run" -o "bt all" -- ./XEngine_StreamMediaApp -t
85-
./XEngine_StreamMediaApp -t
84+
lldb -- ./XEngine_StreamMediaApp -t <<EOF
85+
run
86+
bt all
87+
quit
88+
EOF
89+
# ./XEngine_StreamMediaApp -t
8690
8791
- name: Upload folder as artifact with mac x64
8892
if: matrix.os == 'macos-13'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ c c++ streammedia server
3838
| -------- | --------- | -------- | -------- |
3939
| RTMP | H264 | AAC | 已完成 |
4040
| SRT | H264 | AAC | 已完成 |
41-
| WEBRTC | H264 | OPUS | 未开始 |
41+
| WEBRTC | H264 | OPUS | 进行中 |
4242
| GB28181 | H264 | AAC | 未开始 |
4343
| JT1078 | H264 | AAC | 已完成 |
4444
| XStream | H264 | AAC | 已完成 |

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tszSMSUrl": "rtmp://app.xyry.org/live",
3-
"tszIPAddr": "10.0.4.69",
3+
"tszIPAddr": "127.0.0.1",
44
"bDeamon": 0,
55
"nRTMPPort": 1935,
66
"nHttpPort": 5600,

XEngine_Release/XEngine_Config/XEngine_Version.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer": [
3+
"V2.12.0.1001 Build20250814",
34
"V2.11.1.1001 Build20250409",
45
"V2.11.0.1001 Build20250426",
56
"V2.10.0.1001 Build20250124",

0 commit comments

Comments
 (0)