From fe2b40054f11aea481273811ab81179b3e3fdcc4 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Thu, 13 Jun 2024 18:19:35 +0530 Subject: [PATCH] finishing touches --- CHANGELOG.md | 2 +- CONTRIBUTORS.md | 3 ++- Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88c3c78c..2a0337b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,7 +60,7 @@ multiple `SockAddr`s; it will attempt to contact the host on all of them and use whichever responds first. This allows us to pass both ipv4 and ipv6 addresses when available and transparently use whichever is more performant. -- Added `docker-build`, `docker-run`, `docker-clean` and `docker-save` targets +- Added `docker-gui-release`, `docker-gui-debug`, `docker-server-release`, `docker-server-debug`, `docker-clean` and `docker-save` targets to Makefile. - Fixed an issue in Assault where being teleported back to base with a sticky bomb stuck to you would do some crazy rubber-band-launching thing (Thanks diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 30865a77..2aaa069b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -64,4 +64,5 @@ ### Loup Garou - Added sphinx documentation generation -- Added docker build \ No newline at end of file +- Added docker build system +- Various CI/CD improvements \ No newline at end of file diff --git a/Makefile b/Makefile index 79fba828..9cbdb0f9 100644 --- a/Makefile +++ b/Makefile @@ -1193,7 +1193,7 @@ docker-gui-debug: assets-cmake # Build the docker image docker-server-release: assets-cmake - $(PCOMMAND) build_docker_server_release, + $(PCOMMAND) build_docker_server_release # Build the docker image docker-server-debug: assets-cmake