From 6b332eabd29a6a328595644690c12f902b4a2665 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 13 Jan 2022 18:31:12 +0300 Subject: [PATCH] scripts: gha: include extras in MAGX and Win32 builds too (Linux and Android already have it) --- scripts/gha/build_motomagx.sh | 3 ++- scripts/gha/build_win32.sh | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/gha/build_motomagx.sh b/scripts/gha/build_motomagx.sh index 8ab397a1..c103bd42 100755 --- a/scripts/gha/build_motomagx.sh +++ b/scripts/gha/build_motomagx.sh @@ -23,13 +23,14 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3 export HOME=$mypath export SDL_QT_INVERT_ROTATION=1 export SWAP_PATH=$HOME/xash.swap +export XASH3D_EXTRAS_PAK1=$HOME/extras.pak cd $mypath sleep 1 exec $mypath/xash -dev $@ EOF +python3 scripts/makepak.py xash-extras/ Xash/extras.pak mkdir -p artifacts/ - 7z a -t7z artifacts/xash3d-fwgs-magx.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r Xash/ diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh index ad11f6bc..4676458f 100755 --- a/scripts/gha/build_win32.sh +++ b/scripts/gha/build_win32.sh @@ -24,5 +24,8 @@ else die fi +mkdir valve/ +python3 scripts/makepak.py xash-extras/ valve/extras.pak + mkdir -p artifacts/ -7z a -t7z artifacts/xash3d-fwgs-win32-$ARCH.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on *.dll *.exe *.pdb +7z a -t7z artifacts/xash3d-fwgs-win32-$ARCH.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on *.dll *.exe *.pdb valve/