Skip to content

Commit 6d294e9

Browse files
committed
modify:test off for the moment
1 parent f0ded24 commit 6d294e9

File tree

9 files changed

+8
-10
lines changed

9 files changed

+8
-10
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-
- develop1
6+
- develop
77
paths:
88
- 'XEngine_Source/**'
99
- 'XEngine_Release/**'

.github/workflows/codeql.yml

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

.github/workflows/cppcheck.yml

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

.github/workflows/debian_build.yml

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

.github/workflows/fedora_build.yml

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

.github/workflows/macbuild.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ jobs:
8080
- name: test (srt bug on macos,not run)
8181
run: |
8282
cd XEngine_Release
83-
brew install llvm
84-
lldb --batch -o "run" -o "bt all" -- ./XEngine_StreamMediaApp -t
8583
#./XEngine_StreamMediaApp -t
8684
8785
- name: Upload folder as artifact with mac x64

.github/workflows/msbuild.yml

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

.github/workflows/ubuntu_build.yml

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

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ int main(int argc, char** argv)
258258
if (!RTPProtocol_Parse_Init(1))
259259
{
260260
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,初始化RTP包解析器失败,错误:%lX"), RTPProtocol_GetLastError());
261-
return false;
261+
goto XENGINE_SERVICEAPP_EXIT;
262262
}
263263
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化RTP包解析器成功"));
264264
//启动HTTP服务相关代码

0 commit comments

Comments
 (0)