build: rebase me daddy

.github/workflows/build.yml

@@ -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 }}

data/autoexec_server.cfg

@@ -17,7 +17,7 @@
 #sv_port 8303
 
 # Server name
-sv_name "My DDCat server"
+sv_name "My DDNet server"
 
 # Password for joining the server, empty for no password
 password ""
@@ -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
@@ -78,7 +78,7 @@ sv_rescue_delay 5
 # --------------------
 
 # Message on chat displayed when joining
-sv_welcome "Welcome to DDCat Network"
+sv_welcome "Welcome to my server!"
 
 # File which will have the announcements (each one in new line)
 sv_announcement_filename "announcement.txt"
@@ -90,7 +90,7 @@ sv_announcement_interval 120
 sv_announcement_random 1
 
 # Message of the day to display when joining the server (use "\n" to create new line)
-sv_motd "Don't forget to check server rules by using /rules"
+sv_motd "Testserver with DDraceNetwork Features!\nDon't forget to check server rules by using /rules"
 
 # Use default DDRace rules
 sv_ddrace_rules 1
@@ -124,14 +124,14 @@ sv_reset_file "reset.cfg"
 #
 # You can learn more about tunes on http://ddnet.org/settingscommands/#tunings
 
-# add_map_votes
-# add_vote " " "info"
-# add_vote "Option: Normal gravity" "tune gravity 0.50"
-# add_vote "Option: Moon gravity" "tune gravity 0.25"
-# add_vote "Option: No gravity" "tune gravity 0.00"
-# add_vote "  " "info"
-# add_vote "Option: Reset server" "exec autoexec_server.cfg"
-# add_vote "Option: Shutdown server" "shutdown"
+add_map_votes
+add_vote " " "info"
+add_vote "Option: Normal gravity" "tune gravity 0.50"
+add_vote "Option: Moon gravity" "tune gravity 0.25"
+add_vote "Option: No gravity" "tune gravity 0.00"
+add_vote "  " "info"
+add_vote "Option: Reset server" "exec autoexec_server.cfg"
+add_vote "Option: Shutdown server" "shutdown"
 
 
 # Only show errors for the next commands. Can't do that for the log file

scripts/integration_test.sh

@@ -185,7 +185,8 @@ function wait_for_launch() {
 
 echo "[*] Launch server"
 $tool ../DDNet-Server \
-	"sv_input_fifo server.fifo;
+    "sv_shutdown_after_finish
+	sv_input_fifo server.fifo;
 	sv_rcon_password rcon;
 	sv_map coverage;
 	sv_sqlite_file ddnet-server.sqlite;
@@ -280,6 +281,12 @@ fi
 # Kill all processes first so all outputs are fully written
 kill_all
 
+cat server.log
+cat stdout_client1.txt
+cat stderr_client1.txt
+cat stdout_client2.txt
+cat stderr_client2.txt
+
 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