Skip to content

Commit 55a19cc

Browse files
committed
ci:update macos and linux build
1 parent 0223990 commit 55a19cc

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

.github/workflows/Alma_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
run: |
6666
dnf update -y
6767
dnf install gcc g++ make git jq unzip wget -y
68-
dnf install libsrtp-devel srt-devel -y
6968
7069
- name: install xengine library
7170
run: |
@@ -77,6 +76,9 @@ jobs:
7776
chmod 777 *
7877
./XEngine_LINEnv.sh -i 3
7978
79+
- name: install depend library
80+
run: dnf install libsrtp-devel srt-devel -y
81+
8082
- name: make
8183
run: |
8284
cd XEngine_Source

.github/workflows/Centos_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
run: |
7070
dnf update -y
7171
dnf install gcc g++ make git jq unzip wget -y
72-
dnf install libsrtp-devel srt-devel -y
7372
7473
- name: install xengine library
7574
run: |
@@ -81,6 +80,9 @@ jobs:
8180
chmod 777 *
8281
./XEngine_LINEnv.sh -i 3
8382
83+
- name: install depend library
84+
run: dnf install libsrtp-devel srt-devel -y
85+
8486
- name: make
8587
run: |
8688
cd XEngine_Source

.github/workflows/Rocky_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
7777
chmod 777 *
7878
./XEngine_LINEnv.sh -i 3
79+
7980
- name: install depend library
8081
run: dnf install libsrtp-devel srt-devel -y
8182

.github/workflows/macbuild.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
strategy:
1818
matrix:
1919
include:
20-
- os: macos-13
21-
- os: macos-14
20+
- os: macos-15
21+
- os: macos-15-intel
2222
runs-on: ${{ matrix.os }}
2323

2424
steps:
@@ -48,13 +48,13 @@ jobs:
4848
run: echo "TERM=xterm" >> $GITHUB_ENV
4949

5050
- name: Set up Dependency x86_64 Environment
51-
if: matrix.os == 'macos-13'
51+
if: matrix.os == 'macos-15-intel'
5252
run: |
5353
cd libxengine
5454
chmod 777 *
5555
./XEngine_LINEnv.sh -i 3
5656
- name: Set up Dependency Arm64 Environment
57-
if: matrix.os == 'macos-14'
57+
if: matrix.os == 'macos-15'
5858
run: |
5959
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)
6060
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -83,14 +83,14 @@ jobs:
8383
#./XEngine_StreamMediaApp -t
8484
8585
- name: Upload folder as artifact with mac x64
86-
if: matrix.os == 'macos-13'
86+
if: matrix.os == 'macos-15-intel'
8787
uses: actions/upload-artifact@v4
8888
with:
8989
name: XEngine_StreamMediaApp-Mac_x86_64
9090
path: XEngine_Release/
9191
retention-days: 1
9292
- name: Upload folder as artifact with mac arm
93-
if: matrix.os == 'macos-14'
93+
if: matrix.os == 'macos-15'
9494
uses: actions/upload-artifact@v4
9595
with:
9696
name: XEngine_StreamMediaApp-Mac_Arm64

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleProtocol -L ../
55
-L ../../XEngine_DependLibrary/XEngine_Module/jsoncpp -L ../../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport -L ../../XEngine_DependLibrary/XEngine_Module/XEngine_Verification
66
LIB = -lXEngine_BaseLib -lXEngine_Algorithm \
77
-lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption \
8+
-lXClient_APIHelp \
89
-lXEngine_SystemApi \
910
-lHelpComponents_XLog -lHelpComponents_Packets \
1011
-lNetHelp_APIHelp -lNetHelp_XSocket -lNetHelp_APIAddr \

0 commit comments

Comments
 (0)