Skip to content

Commit bf69441

Browse files
committed
fixed:ci build
1 parent ff9b352 commit bf69441

File tree

3 files changed

+39
-10
lines changed

3 files changed

+39
-10
lines changed

.github/workflows/msbuild.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +91,43 @@ jobs:
9191
./VSCopy_x86.bat
9292
./XEngine_StorageApp.exe -t
9393
shell: pwsh
94-
- name: Conditional Step for x86 Debug
95-
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
94+
- name: Conditional Step for x86 Release
95+
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
9696
run: |
97-
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
98-
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
99-
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
97+
cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
98+
cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
99+
cp -r XEngine_Source/VSCopy_x64.bat XEngine_Release/
100100
cd XEngine_Release
101-
./VSCopy_x86.bat
102-
./XEngine_StorageApp.exe -t
101+
./VSCopy_x64.bat
102+
shell: pwsh
103+
- name: Conditional Step for ARM64 Release
104+
if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'
105+
run: |
106+
cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
107+
cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
108+
cp -r XEngine_Source/VSCopy_Arm64.bat XEngine_Release/
109+
cd XEngine_Release
110+
./VSCopy_Arm64.bat
103111
shell: pwsh
104112

105113
- name: Upload folder as artifact with x86
106-
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
114+
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
107115
uses: actions/upload-artifact@v4
108116
with:
109117
name: XEngine_StorageApp-x86_32-Windows
110118
path: XEngine_Release/
111119
retention-days: 1
112-
113120
- name: Upload folder as artifact with x64
114121
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
115122
uses: actions/upload-artifact@v4
116123
with:
117124
name: XEngine_StorageApp-x86_64-Windows
118125
path: XEngine_Release/
126+
retention-days: 1
127+
- name: Upload folder as artifact with x64
128+
if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'
129+
uses: actions/upload-artifact@v4
130+
with:
131+
name: XEngine_StorageApp-Arm64-Windows
132+
path: XEngine_Release/
119133
retention-days: 1

XEngine_Source/StorageModule_Database/Database_File/Database_File.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ bool CDatabase_File::Database_File_TimeDel()
596596
{
597597
//删除文件
598598
int nListCount = 0;
599-
XSTORAGECORE_DBFILE **ppSt_ListFile;
599+
XSTORAGECORE_DBFILE **ppSt_ListFile = NULL;
600600
Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, NULL, NULL, NULL, NULL, pptszResult[0]);
601601
for (int i = 0; i < nListCount; i++)
602602
{

XEngine_Source/VSCopy_Arm64.bat

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
copy /y "%XEngine_LibArm64%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
2+
copy /y "%XEngine_LibArm64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
3+
copy /y "%XEngine_LibArm64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
4+
copy /y "%XEngine_LibArm64%\XEngine_Core\XEngine_Core.dll" "./"
5+
copy /y "%XEngine_LibArm64%\XEngine_Core\XEngine_ManagePool.dll" "./"
6+
copy /y "%XEngine_LibArm64%\XEngine_Core\XEngine_Cryption.dll" "./"
7+
8+
copy /y "%XEngine_LibArm64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
9+
copy /y "%XEngine_LibArm64%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"
10+
copy /y "%XEngine_LibArm64%\XEngine_Client\XClient_APIHelp.dll" "./"
11+
copy /y "%XEngine_LibArm64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
12+
13+
copy /y "%XEngine_LibArm64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
14+
copy /y "%XEngine_LibArm64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
15+
copy /y "%XEngine_LibArm64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"

0 commit comments

Comments
 (0)