Merge pull request #86 from hzqst/thirdparty

fix live build
DrAbcOfficial · Feb 19, 2025 · e974709 · e974709
2 parents 885aa62 + c7b4949
commit e974709
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 48 deletions.
diff --git a/.github/workflows/livebuild.yml b/.github/workflows/livebuild.yml
@@ -19,47 +19,34 @@ jobs:
     runs-on: windows-latest
 
     steps:    
-    - name: Git Clone Metahook
-      uses: sudosubin/git-clone-action@v1.0.1
-      with:
-        repository: hzqst/MetaHookSv
-        path: MetaHookSv
 
-    - name: Git Clone This
-      uses: sudosubin/git-clone-action@v1.0.1
-      with:
-        repository: DrAbcOfficial/ABCEnchance
-        path: MetaHookSv/Plugins/ABCEnchance
-
-    - name: Setup build env
-      working-directory: MetaHookSv
-      run: |
-          git submodule update --init --recursive
+    - uses: hzqst/checkout@v2.3.4
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
 
-    - name: Add Missing File
-      working-directory: MetaHookSv/Plugins/ABCEnchance/src
-      run: New-item ./Source/Utility/NeteaseApi.cpp;New-item ./Header/Utility/NeteaseApi.h
+    - name: Init dependencies
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: git submodule update --init --recursive
+      shell: cmd
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}}
 
     - name: Build AVX
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION_AVX}} ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION_AVX}}
 
     - name: Move to build
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |
-          Move-Item -Force -Path "MetaHookSv/Plugins/ABCEnchance/Build/ABCEnchance.dll" -Destination "MetaHookSv/Plugins/ABCEnchance/Build/svencoop/metahook/plugins/ABCEnchance.dll"
-          Move-Item -Force -Path "MetaHookSv/Plugins/ABCEnchance/Build/ABCEnchance_AVX2.dll" -Destination "MetaHookSv/Plugins/ABCEnchance/Build/svencoop/metahook/plugins/ABCEnchance_AVX2.dll"
+          Move-Item -Force -Path "Build/ABCEnchance.dll" -Destination "Build/svencoop/metahook/plugins/ABCEnchance.dll"
+          Move-Item -Force -Path "Build/ABCEnchance_AVX2.dll" -Destination "Build/svencoop/metahook/plugins/ABCEnchance_AVX2.dll"
     - name: Zipping All
       uses: vimtor/action-zip@v1
       with:
-          files: MetaHookSv/Plugins/ABCEnchance/build/
+          files: build/
           dest: ABCEnchance-windows-x86.zip
     - name: Current Time
       uses: srfrnk/current-time@master

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -18,53 +18,40 @@ jobs:
     runs-on: windows-latest
 
     steps:    
-    - name: Git Clone Metahook
-      uses: sudosubin/git-clone-action@v1.0.1
-      with:
-        repository: hzqst/MetaHookSv
-        path: MetaHookSv
 
-    - name: Git Clone This
-      uses: sudosubin/git-clone-action@v1.0.1
-      with:
-        repository: DrAbcOfficial/ABCEnchance
-        path: MetaHookSv/Plugins/ABCEnchance
-
-    - name: Setup build env
-      working-directory: MetaHookSv
-      run: |
-          git submodule update --init --recursive
+    - uses: hzqst/checkout@v2.3.4
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
 
-    - name: Add Missing File
-      working-directory: MetaHookSv/Plugins/ABCEnchance/src
-      run: New-item ./Source/Utility/NeteaseApi.cpp;New-item ./Header/Utility/NeteaseApi.h
+    - name: Init dependencies
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: git submodule update --init --recursive
+      shell: cmd
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}}
 
     - name: Build AVX
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION_AVX}} ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION_AVX}}
 
     - name: Build Installer
-      working-directory: MetaHookSv/Plugins/ABCEnchance/ABCEnchanceInstaller
+      working-directory: ABCEnchanceInstaller
       run: dotnet publish -p:PublishProfile=FolderProfile
 
     - name: Move to build
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |
-          Move-Item -Force -Path "MetaHookSv/Plugins/ABCEnchance/Build/ABCEnchance.dll" -Destination "MetaHookSv/Plugins/ABCEnchance/Build/svencoop/metahook/plugins/ABCEnchance.dll"
-          Move-Item -Force -Path "MetaHookSv/Plugins/ABCEnchance/Build/ABCEnchance_AVX2.dll" -Destination "MetaHookSv/Plugins/ABCEnchance/Build/svencoop/metahook/plugins/ABCEnchance_AVX2.dll"
-          Move-Item -Force -Path "MetaHookSv/Plugins/ABCEnchance/ABCEnchanceInstaller/bin/publish/ABCEnchanceInstaller.exe" -Destination "MetaHookSv/Plugins/ABCEnchance/Build/Installer.exe"
+          Move-Item -Force -Path "Build/ABCEnchance.dll" -Destination "Build/svencoop/metahook/plugins/ABCEnchance.dll"
+          Move-Item -Force -Path "Build/ABCEnchance_AVX2.dll" -Destination "Build/svencoop/metahook/plugins/ABCEnchance_AVX2.dll"
+          Move-Item -Force -Path "ABCEnchanceInstaller/bin/publish/ABCEnchanceInstaller.exe" -Destination "Build/Installer.exe"
 
     - name: Zipping All
       uses: vimtor/action-zip@v1
       with:
-          files: MetaHookSv/Plugins/ABCEnchance/build/
+          files: build/
           dest: ABCEnchance-windows-x86.zip
 
     - name: Create Release