From 372824aee385dc5c88874e071c474984126a1cf2 Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Mon, 20 May 2024 03:27:51 +0300 Subject: [PATCH] reduce verbosity for win + dry run make on linux before actual run to show command + attempt to workaround broken gen proto premake action --- .github/workflows/emu-build-all-linux.yml | 5 ++++- .github/workflows/emu-build-all-win.yml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/emu-build-all-linux.yml b/.github/workflows/emu-build-all-linux.yml index d36454a7..73753144 100644 --- a/.github/workflows/emu-build-all-linux.yml +++ b/.github/workflows/emu-build-all-linux.yml @@ -80,7 +80,7 @@ jobs: working-directory: ${{ github.workspace }} run: | sudo chmod 777 ./third-party/common/linux/premake/premake5 - ./third-party/common/linux/premake/premake5 --file=premake5.lua --os=linux generateproto + ./third-party/common/linux/premake/premake5 --file=premake5.lua --os=linux generateproto || echo ; ./third-party/common/linux/premake/premake5 --file=premake5.lua --emubuild=${{ github.sha }} --os=linux gmake2 exit 0 @@ -89,6 +89,9 @@ jobs: shell: bash working-directory: ${{ github.workspace }}/GBE_Build run: | + echo "dry run..." + make -n -j 2 config=${{ matrix.cfg }}_${{ matrix.arch }} ${{ matrix.prj }} + echo "actual run..." make -j 2 config=${{ matrix.cfg }}_${{ matrix.arch }} ${{ matrix.prj }} ### upload artifact/package to github Actions (for targets) diff --git a/.github/workflows/emu-build-all-win.yml b/.github/workflows/emu-build-all-win.yml index 85508951..d7e8b401 100644 --- a/.github/workflows/emu-build-all-win.yml +++ b/.github/workflows/emu-build-all-win.yml @@ -78,7 +78,7 @@ jobs: shell: cmd working-directory: ${{ github.workspace }} run: | - third-party\common\win\premake\premake5.exe --file=premake5.lua --os=windows generateproto + third-party\common\win\premake\premake5.exe --file=premake5.lua --os=windows generateproto || echo: third-party\common\win\premake\premake5.exe --file=premake5.lua --emubuild=${{ github.sha }} --os=windows vs2022 exit /b 0 @@ -87,7 +87,7 @@ jobs: shell: cmd working-directory: ${{ github.workspace }}/GBE_Build run: | - msbuild /nologo /target:${{ matrix.prj }} /m:2 /v:diag /p:Configuration=${{ matrix.cfg }},Platform=${{ matrix.arch }} GBE.sln + msbuild /nologo /target:${{ matrix.prj }} /m:2 /v:d /p:Configuration=${{ matrix.cfg }},Platform=${{ matrix.arch }} GBE.sln ### upload artifact/package to github Actions (for targets) - name: Upload build package (for targets)