improved:ms build and fixed code ql

libxengine · Sep 19, 2024 · a572750 · a572750
1 parent e54dc40
commit a572750
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,7 +41,6 @@ jobs:
  cd libxengine
  chmod 777 *
  sudo ./XEngine_LINEnv.sh -i 3
- cd ..
 
  - name: make
  run: | 
@@ -50,11 +49,6 @@ jobs:
  make FLAGS=InstallAll
  make FLAGS=CleanAll
 
- make RELEASE=1
- make FLAGS=InstallAll
- make FLAGS=CleanAll
- cd ..
-
  - name: Perform CodeQL Analysis
  uses: github/codeql-action/analyze@v3
  with:

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -65,3 +65,33 @@ jobs:
  ./VSCopy-x86.bat
  ./XEngine_MQServiceApp.exe -t
  shell: pwsh
+ - name: Conditional Step for x86 Debug
+ if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
+ run: |
+ cp -r XEngine_Source/Debug/*.dll XEngine_Release/
+ cp -r XEngine_Source/Debug/*.exe XEngine_Release/
+ cp -r XEngine_Source/VSCopy-x86.bat XEngine_Release/
+ cd XEngine_Release
+ ./VSCopy-x86.bat
+ ./XEngine_MQServiceApp.exe -t
+ shell: pwsh
+ - name: Conditional Step for x64 Release
+ if: matrix.configuration == 'Release' && matrix.platform == 'x64'
+ run: |
+ cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
+ cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
+ cp -r XEngine_Source/VSCopy-x64.bat XEngine_Release/
+ cd XEngine_Release
+ ./VSCopy-x64.bat
+ ./XEngine_MQServiceApp.exe -t
+ shell: pwsh
+ - name: Conditional Step for x64 Debug
+ if: matrix.configuration == 'Debug' && matrix.platform == 'x64'
+ run: |
+ cp -r XEngine_Source/x64/Debug/*.dll XEngine_Release/
+ cp -r XEngine_Source/x64/Debug/*.exe XEngine_Release/
+ cp -r XEngine_Source/VSCopy-x64.bat XEngine_Release/
+ cd XEngine_Release
+ ./VSCopy-x64.bat
+ ./XEngine_MQServiceApp.exe -t
+ shell: pwsh