update yml

hzqst · Jan 8, 2024 · 91ab8c1 · 91ab8c1
1 parent 31c5f7e
commit 91ab8c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -21,13 +21,15 @@ jobs:
         run: sudo apt-get install make build-essential gcc gcc-multilib g++-multilib
 
       - name: Build all
+        working-directory: ${{env.GITHUB_WORKSPACE}}
         run: |
-          sudo chmod +777 build-all-linux.sh
+          cd scripts
+          sudo chmod +777 *.sh
           ./build-all-linux.sh
           
       - name: Remove placeholder
         working-directory: ${{env.GITHUB_WORKSPACE}}
-        run: rm -f build/addons/metamod/dlls/.placeholder
+        run: rm "build\addons\metamod\dlls\.placeholder"
 
       - name: Archive the build directory 
         uses: thedoctor0/zip-release@main

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -26,25 +26,11 @@ jobs:
     steps:
       - uses: hzqst/[email protected]
 
-      - name: Get submodules
+      - name: Build all
         working-directory: ${{env.GITHUB_WORKSPACE}}
-        run: git submodule update --init --recursive
-        shell: cmd
-
-      - name: Build capstone
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        run: build-capstone.bat
-        shell: cmd
-
-      - name: Build bullet3
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        run: build-bullet3.bat
-        shell: cmd
-
-      - name: Build metamod
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        run: build-metamod.bat
-        shell: cmd
+        run: |
+          cd scripts
+          call build-all-win32.bat
 
       - name: Remove placeholder
         working-directory: ${{env.GITHUB_WORKSPACE}}