Skip to content

Commit db5ac7f

Browse files
committed
fixed:rockylinux build
1 parent 5b954cd commit db5ac7f

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

.github/workflows/macbuild.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,9 @@ jobs:
8080
make PLATFORM=mac FLAGS=InstallAll
8181
make PLATFORM=mac FLAGS=CleanAll
8282
83-
- name: test (srt bug on macos-arm64,not run)
84-
if: matrix.os == 'macos-13'
83+
- name: test (srt bug on macos,not run)
8584
run: |
8685
cd XEngine_Release
87-
./XEngine_StreamMediaApp -t
8886
8987
- name: Upload folder as artifact with mac x64
9088
if: matrix.os == 'macos-13'

.github/workflows/release.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717

18-
- name: Download x86_64 ubuntubuild
18+
- name: Download x86_64 ubuntu build
1919
uses: dawidd6/action-download-artifact@v6
2020
with:
2121
workflow: ubuntux86_64_build.yml
@@ -24,7 +24,7 @@ jobs:
2424
skip_unpack: true
2525
if_no_artifact_found: fail
2626
path: ./XRelease/
27-
- name: Download Arm64 ubuntubuild
27+
- name: Download Arm64 ubuntu build
2828
uses: dawidd6/action-download-artifact@v6
2929
with:
3030
workflow: UbuntuArm64_build.yml
@@ -33,6 +33,24 @@ jobs:
3333
skip_unpack: true
3434
if_no_artifact_found: fail
3535
path: ./XRelease/
36+
- name: Download x86_64 rockylinux build
37+
uses: dawidd6/action-download-artifact@v6
38+
with:
39+
workflow: RockyX86_64_build.yml
40+
workflow_conclusion: success
41+
check_artifacts: false
42+
skip_unpack: true
43+
if_no_artifact_found: fail
44+
path: ./XRelease/
45+
- name: Download Arm64 rockylinux build
46+
uses: dawidd6/action-download-artifact@v6
47+
with:
48+
workflow: RockyArm64_build.yml
49+
workflow_conclusion: success
50+
check_artifacts: false
51+
skip_unpack: true
52+
if_no_artifact_found: fail
53+
path: ./XRelease/
3654
- name: Download macbuild
3755
uses: dawidd6/action-download-artifact@v6
3856
with:

XEngine_Source/XEngine_ModuleHelp/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ ifeq ($(MACRO_SRT_SUPPORT),1)
1919
ifeq ($(PLATFORM),mac)
2020
LIB += -lsrt
2121
else
22-
LIB += -lsrt-gnutls
22+
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
23+
LIB += -lsrt
24+
else
25+
LIB += -lsrt-gnutls
26+
endif
27+
2328
endif
2429
endif
2530
ifeq ($(MACRO_RTC_SUPPORT),1)

0 commit comments

Comments
 (0)