Skip to content

Commit 5571c0c

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #28 from libxengine/develop
V2.10.0.1001 Merge
2 parents 35eb670 + cbb20f7 commit 5571c0c

File tree

59 files changed

+794
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+794
-304
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: CodeQL Advanced
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
jobs:
13+
analyze:
14+
runs-on: ubuntu-24.04
15+
permissions:
16+
security-events: write
17+
packages: read
18+
actions: read
19+
contents: read
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
include:
25+
- language: c-cpp
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
with:
30+
ref: 'develop'
31+
32+
- name: Checkout dependency repository (xengine)
33+
uses: actions/checkout@v4
34+
with:
35+
repository: libxengine/libxengine
36+
path: libxengine
37+
38+
- name: sub module checkout (opensource)
39+
run: |
40+
git submodule init
41+
git submodule update
42+
43+
- name: Set up Dependency Environment
44+
run: |
45+
cd libxengine
46+
chmod +x ./XEngine_LINEnv.sh
47+
sudo ./XEngine_LINEnv.sh -i 3
48+
49+
- name: install library
50+
run: sudo apt install libsrt-gnutls-dev libsrtp2-dev -y
51+
52+
- name: Initialize CodeQL
53+
uses: github/codeql-action/init@v3
54+
with:
55+
languages: ${{ matrix.language }}
56+
57+
- name: make
58+
run: |
59+
cd XEngine_Source
60+
make
61+
62+
- name: Perform CodeQL Analysis
63+
uses: github/codeql-action/analyze@v3
64+
with:
65+
category: "/language:${{ matrix.language }}"

‎.github/workflows/cppcheck.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: cpp check workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout main repository code
18+
uses: actions/checkout@v4
19+
with:
20+
ref: 'develop'
21+
22+
- name: Create static_analysis directory
23+
run: mkdir -p static_analysis
24+
25+
- name: Run Cppcheck
26+
run: |
27+
sudo apt-get install -y cppcheck
28+
cppcheck --enable=all --language=c++ --std=c++20 ./XEngine_Source/ --output-file=static_analysis/log.xml --xml
29+
continue-on-error: true
30+
31+
- name: Upload Cppcheck Results
32+
uses: actions/upload-artifact@v4
33+
with:
34+
name: cppcheck_results
35+
path: static_analysis/log.xml

‎.github/workflows/issue-translator.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Issue Translator
2+
on:
3+
issue_comment:
4+
types: [created]
5+
issues:
6+
types: [opened]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: usthe/[email protected]
13+
with:
14+
IS_MODIFY_TITLE: false
15+
CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically.

‎.github/workflows/linuxbuild.yml‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎.github/workflows/macbuild.yml‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ name: macos build workflows
22

33
on:
44
push:
5-
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
8-
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
912
permissions:
1013
contents: read
1114

@@ -15,6 +18,7 @@ jobs:
1518
matrix:
1619
include:
1720
- os: macos-13
21+
- os: macos-14
1822
runs-on: ${{ matrix.os }}
1923

2024
steps:
@@ -23,7 +27,6 @@ jobs:
2327
with:
2428
ref: 'develop'
2529

26-
# 检出依赖的xengine仓库到指定的xengine目录
2730
- name: Checkout dependency repository (xengine)
2831
uses: actions/checkout@v4
2932
with:
@@ -41,14 +44,29 @@ jobs:
4144
- name: install library
4245
run: brew install srt srtp
4346

44-
# 设置依赖库的环境变量
45-
- name: Set up Dependency Environment Variables
47+
- name: Set up Dependency x86_64 Environment
48+
if: matrix.os == 'macos-13'
4649
run: |
4750
cd libxengine
4851
chmod 777 *
4952
./XEngine_LINEnv.sh -i 3
50-
cd ..
51-
#编译
53+
- name: Set up Dependency Arm64 Environment
54+
if: matrix.os == 'macos-14'
55+
run: |
56+
cd libxengine
57+
chmod 777 *
58+
./XEngine_LINEnv.sh -i 0
59+
60+
latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
61+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
62+
unzip ./XEngine_Mac_Arm64.zip -d ./XEngine_Mac_Arm64
63+
cd XEngine_Mac_Arm64
64+
65+
sudo mkdir -p /usr/local/include
66+
sudo mkdir -p /usr/local/lib
67+
sudo cp -rf ./XEngine_Include /usr/local/include
68+
sudo find ./XEngine_Mac -name "*.dylib" -exec cp {} /usr/local/lib \;
69+
5270
- name: make debug
5371
run: |
5472
cd XEngine_Source
@@ -61,6 +79,24 @@ jobs:
6179
make PLATFORM=mac RELEASE=1
6280
make PLATFORM=mac FLAGS=InstallAll
6381
make PLATFORM=mac FLAGS=CleanAll
64-
- name: test
82+
83+
- name: test (srt bug on macos-arm64,not run)
84+
if: matrix.os == 'macos-13'
6585
run: |
6686
cd XEngine_Release
87+
./XEngine_StreamMediaApp -t
88+
89+
- name: Upload folder as artifact with mac x64
90+
if: matrix.os == 'macos-13'
91+
uses: actions/upload-artifact@v4
92+
with:
93+
name: XEngine_StreamMediaApp-x86_64-Mac
94+
path: XEngine_Release/
95+
retention-days: 3
96+
- name: Upload folder as artifact with mac arm
97+
if: matrix.os == 'macos-14'
98+
uses: actions/upload-artifact@v4
99+
with:
100+
name: XEngine_StreamMediaApp-Arm64-Mac
101+
path: XEngine_Release/
102+
retention-days: 3

0 commit comments

Comments
 (0)