Skip to content

Commit a6f91e7

Browse files
committed
ci:add ubuntu arm64
ci:update release name fixed:build error
1 parent ecf5e20 commit a6f91e7

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

.github/workflows/macbuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ jobs:
9090
if: matrix.os == 'macos-13'
9191
uses: actions/upload-artifact@v4
9292
with:
93-
name: XEngine_StreamMediaApp-x86_64-Mac
93+
name: XEngine_StreamMediaApp-Mac_x86_64
9494
path: XEngine_Release/
9595
retention-days: 1
9696
- name: Upload folder as artifact with mac arm
9797
if: matrix.os == 'macos-14'
9898
uses: actions/upload-artifact@v4
9999
with:
100-
name: XEngine_StreamMediaApp-Arm64-Mac
100+
name: XEngine_StreamMediaApp-Mac_Arm64
101101
path: XEngine_Release/
102102
retention-days: 1

.github/workflows/msbuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,21 +145,21 @@ jobs:
145145
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
146146
uses: actions/upload-artifact@v4
147147
with:
148-
name: XEngine_StreamMediaApp-x86_32-Windows
148+
name: XEngine_StreamMediaApp-Windows_x86_32
149149
path: XEngine_Release/
150150
retention-days: 1
151151

152152
- name: Upload folder as artifact with x64
153153
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
154154
uses: actions/upload-artifact@v4
155155
with:
156-
name: XEngine_StreamMediaApp-x86_64-Windows
156+
name: XEngine_StreamMediaApp-Windows_x86_64
157157
path: XEngine_Release/
158158
retention-days: 1
159159
- name: Upload folder as artifact with ARM64
160160
if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'
161161
uses: actions/upload-artifact@v4
162162
with:
163-
name: XEngine_StreamMediaApp-Arm64-Windows
163+
name: XEngine_StreamMediaApp-Windows_Arm64
164164
path: XEngine_Release/
165165
retention-days: 1

.github/workflows/release.yml

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

18-
- name: Download ubuntubuild
18+
- name: Download x86_64 ubuntubuild
1919
uses: dawidd6/action-download-artifact@v6
2020
with:
21-
workflow: ubuntubuild.yml
21+
workflow: ubuntux86_64_build.yml
22+
workflow_conclusion: success
23+
check_artifacts: false
24+
skip_unpack: true
25+
if_no_artifact_found: fail
26+
path: ./XRelease/
27+
- name: Download Arm64 ubuntubuild
28+
uses: dawidd6/action-download-artifact@v6
29+
with:
30+
workflow: UbuntuArm64_build.yml
2231
workflow_conclusion: success
2332
check_artifacts: false
2433
skip_unpack: true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ jobs:
8787
if: matrix.os == 'ubuntu-22.04'
8888
uses: actions/upload-artifact@v4
8989
with:
90-
name: XEngine_StreamMediaApp-x86_64-Ubuntu-22.04
90+
name: XEngine_StreamMediaApp-Ubuntu_22.04_x86_64
9191
path: XEngine_Release/
9292
retention-days: 1
9393
- name: Upload folder as artifact with ubuntu24.04
9494
if: matrix.os == 'ubuntu-24.04'
9595
uses: actions/upload-artifact@v4
9696
with:
97-
name: XEngine_StreamMediaApp-x86_64-Ubuntu-24.04
97+
name: XEngine_StreamMediaApp-Ubuntu_24.04_x86_64
9898
path: XEngine_Release/
9999
retention-days: 1

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,5 @@ extern FILE* pSt_AFile;
217217
#pragma comment(lib,"../../Release/XEngine_ModuleQueue")
218218
#pragma comment(lib,"../../Release/XEngine_InfoReport")
219219
#endif
220+
#endif
220221
#endif

0 commit comments

Comments
 (0)