From 91ab8c1f0cdd347fa7b86636c6e72a13c0855d22 Mon Sep 17 00:00:00 2001 From: hzqst <113660872@qq.com> Date: Mon, 8 Jan 2024 10:13:13 +0800 Subject: [PATCH] update yml --- .github/workflows/ubuntu.yml | 6 ++++-- .github/workflows/windows.yml | 22 ++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6dca51a..57dcb0c 100644 --- 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 index 6983288..82afbd6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,25 +26,11 @@ jobs: steps: - uses: hzqst/checkout@v2.3.4 - - 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}}