Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Tests"
on:
push:
branches: [master]
branches: ['*']
paths-ignore:
- '**.md'
- 'cli/'
Expand All @@ -24,7 +24,7 @@ jobs:
persist-credentials: false

- name: "Install Linux dependencies"
timeout-minutes: 2
timeout-minutes: 4
run: |
sudo apt-get update && sudo apt-get install -y \
composer
Expand All @@ -36,7 +36,7 @@ jobs:
composer install

- name: "Run Composer check-full"
timeout-minutes: 10
timeout-minutes: 20
run: |
grep '"timeout": 20,' infection.json5
sed -i 's/"timeout": 20,/"timeout": 40,/' infection.json5
Expand Down
3 changes: 2 additions & 1 deletion cli/server.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
$port = (int)($argv[2] ?? 8080);
$debug = in_array('--debug', $argv);
$bindAddress = "udp://0.0.0.0:$port";
$map = new Maps\DefaultMap();
/////

$settings = new ServerSetting($playersMax); // must be first for correctly setting the global tickRate (Util::$TICK_RATE)
Expand All @@ -22,7 +23,7 @@
$logger->info("Preparing game for launch, please wait...");

$game = ($debug ? GameFactory::createDebug() : GameFactory::createDefaultCompetitive());
$game->loadMap(new Maps\DefaultMap());
$game->loadMap($map);

$logger->info("Starting server on '{$bindAddress}', waiting maximum of '{$settings->warmupWaitSec}' sec for '{$playersMax}' player" . ($playersMax > 1 ? 's' : '') . " to connect.");
$net = new ClueSocket($bindAddress);
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"scripts": {
"post-install-cmd": "@php -d memory_limit=200M cli/generateNavmesh.php",
"stan": "@php vendor/bin/phpstan --memory-limit=300M analyze",
"unit": "@php vendor/bin/phpunit -d memory_limit=70M",
"infection": "@php -d memory_limit=180M vendor/bin/infection --show-mutations --only-covered --threads=max --min-covered-msi=100",
"unit": "@php vendor/bin/phpunit -d memory_limit=200M",
"infection": "@php -d memory_limit=300M vendor/bin/infection --show-mutations --threads=max --min-covered-msi=100",
"dev": "php cli/server.php 1 8080 --debug & php cli/udp-ws-bridge.php",
"dev2": "php cli/server.php 2 8080 --debug & php cli/udp-ws-bridge.php & php cli/udp-ws-bridge.php 8082",
"dev2c": "php cli/server.php 2 8080 --debug & php cli/udp-ws-bridge.php & sleep 2 && php cli/client.php acode 8080",
Expand All @@ -28,7 +28,7 @@
"check-full": [
"@check",
"@coverage",
"@infection-cache"
"@infection-cache --skip-initial-tests"
]
},
"require": {
Expand Down Expand Up @@ -60,7 +60,7 @@
"platform": {
"php": "8.3"
},
"process-timeout": 720,
"process-timeout": 0,
"allow-plugins": {
"infection/extension-installer": false
}
Expand Down
Loading