Skip to content

Commit

Permalink
build: rebase me daddy
Browse files Browse the repository at this point in the history
  • Loading branch information
MilkeeyCat committed Mar 10, 2024
1 parent 64a3639 commit 78019e0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,16 @@ jobs:
sudo apt-get update -y
# mount: /var/lib/grub/esp: special device /dev/disk/by-id/scsi-... does not exist.
# sudo apt-get upgrade -y
sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libvulkan-dev glslang-tools spirv-tools libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libpng-dev valgrind gcovr protobuf-compiler -y
sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libvulkan-dev glslang-tools spirv-tools libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libpng-dev valgrind gcovr -y
# high iq solution
git clone https://github.com/protocolbuffers/protobuf.git --branch v3.21.12 --single-branch
cd protobuf
git submodule update --init --recursive
mkdir build
cd build
cmake ..
sudo make install
- name: Prepare Linux (non-fancy)
if: ${{ contains(matrix.os, 'ubuntu') && !matrix.fancy }}
Expand Down
2 changes: 1 addition & 1 deletion data/autoexec_server.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ loglevel 0
sv_max_clients 64

# Max players with the same IP address
sv_max_clients_per_ip 1
sv_max_clients_per_ip 4

# Tournament mode - when enabled players joins the server as spectator
sv_tournament_mode 0
Expand Down
2 changes: 2 additions & 0 deletions scripts/integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ fi
# Kill all processes first so all outputs are fully written
kill_all

cat server.log

if ! grep -qE '^[0-9]{4}-[0-9]{2}-[0-9]{2} ([0-9]{2}:){2}[0-9]{2} I chat: 0:-2:client1: hello world$' server.log
then
touch fail_chat.txt
Expand Down

0 comments on commit 78019e0

Please sign in to comment.