reduce verbosity for win + dry run make on linux before actual run to show command + attempt to workaround broken gen proto premake action

This commit is contained in:
otavepto 2024-05-20 03:27:51 +03:00
parent 80de67f658
commit 372824aee3
2 changed files with 6 additions and 3 deletions

View File

@ -80,7 +80,7 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
sudo chmod 777 ./third-party/common/linux/premake/premake5 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 ./third-party/common/linux/premake/premake5 --file=premake5.lua --emubuild=${{ github.sha }} --os=linux gmake2
exit 0 exit 0
@ -89,6 +89,9 @@ jobs:
shell: bash shell: bash
working-directory: ${{ github.workspace }}/GBE_Build working-directory: ${{ github.workspace }}/GBE_Build
run: | 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 }} make -j 2 config=${{ matrix.cfg }}_${{ matrix.arch }} ${{ matrix.prj }}
### upload artifact/package to github Actions (for targets) ### upload artifact/package to github Actions (for targets)

View File

@ -78,7 +78,7 @@ jobs:
shell: cmd shell: cmd
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | 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 third-party\common\win\premake\premake5.exe --file=premake5.lua --emubuild=${{ github.sha }} --os=windows vs2022
exit /b 0 exit /b 0
@ -87,7 +87,7 @@ jobs:
shell: cmd shell: cmd
working-directory: ${{ github.workspace }}/GBE_Build working-directory: ${{ github.workspace }}/GBE_Build
run: | 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) ### upload artifact/package to github Actions (for targets)
- name: Upload build package (for targets) - name: Upload build package (for targets)