From 4c89a18ddaa532456b73afac668a0b4636ee1777 Mon Sep 17 00:00:00 2001 From: ota Date: Sat, 16 Dec 2023 07:25:21 +0200 Subject: [PATCH] + fix workspace variable usage in all workflow scripts + chmod 777 linux build script before running it & use sudo --- .github/workflows/build-gen_emu_config.yml | 10 +++++----- .github/workflows/build-linux.yml | 9 ++++----- .github/workflows/build-win.yml | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-gen_emu_config.yml b/.github/workflows/build-gen_emu_config.yml index 8bc7843b..c60b46ba 100644 --- a/.github/workflows/build-gen_emu_config.yml +++ b/.github/workflows/build-gen_emu_config.yml @@ -19,22 +19,22 @@ jobs: runs-on: windows-2022 steps: - - name: Checkout branch - uses: actions/checkout@v4 - - name: Set up Python 3.10 uses: actions/setup-python@v3 with: python-version: "3.10" + - name: Checkout branch + uses: actions/checkout@v4 + - name: Install dependencies shell: cmd - working-directory: ${{env.GITHUB_WORKSPACE}}/scripts + working-directory: ${{ github.workspace }}/scripts run: recreate_venv.bat - name: Rebuild shell: cmd - working-directory: ${{env.GITHUB_WORKSPACE}}/scripts + working-directory: ${{ github.workspace }}/scripts run: rebuild.bat - name: Upload build diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index eca8b015..649ac3bc 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -53,8 +53,7 @@ jobs: - name: Build deps if: steps.cache-deps-linux.outputs.cache-hit != 'true' shell: bash - working-directory: ${{env.GITHUB_WORKSPACE}} - run: sudo ./build_linux_deps.sh + run: sudo chmod 777 build_linux_deps.sh && sudo ./build_linux_deps.sh build: @@ -85,8 +84,8 @@ jobs: ### build + upload release - name: Build release mode shell: bash - working-directory: ${{env.GITHUB_WORKSPACE}} - run: build_linux.sh release + working-directory: ${{ github.workspace }} + run: "sudo chmod 777 build_linux.sh && ./build_linux.sh release" - name: Upload build (release) uses: actions/upload-artifact@v4 @@ -99,7 +98,7 @@ jobs: ### build + upload debug - name: Build debug mode shell: bash - working-directory: ${{env.GITHUB_WORKSPACE}} + working-directory: ${{ github.workspace }} run: build_linux.sh debug - name: Upload build (debug) diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index de8f9da3..8421981c 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -62,7 +62,7 @@ jobs: - name: Build deps if: steps.cache-deps-win.outputs.cache-hit != 'true' shell: cmd - working-directory: ${{env.GITHUB_WORKSPACE}} + working-directory: ${{ github.workspace }} run: build_win_deps.bat @@ -94,7 +94,7 @@ jobs: ### build + upload release - name: Build release mode shell: cmd - working-directory: ${{env.GITHUB_WORKSPACE}} + working-directory: ${{ github.workspace }} run: build_win.bat release - name: Upload build (release) @@ -108,7 +108,7 @@ jobs: ### build + upload debug - name: Build debug mode shell: cmd - working-directory: ${{env.GITHUB_WORKSPACE}} + working-directory: ${{ github.workspace }} run: build_win.bat debug - name: Upload build (debug)