diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml index fd329f3510..9e68e7ee91 100644 --- a/.gitlab/CI/build.gitlab-ci.yml +++ b/.gitlab/CI/build.gitlab-ci.yml @@ -97,8 +97,7 @@ coverage: script: - export MACOSX_DEPLOYMENT_TARGET="10.13" - export VELOREN_USERDATA_STRATEGY=executable - - cargo build --release -p veloren-voxygen --no-default-features --features default-publish - - cargo build --release -p veloren-server-cli + - cargo build --release --no-default-features --features default-publish - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR artifacts: diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 481f44ae39..6d851e1555 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -1,3 +1,4 @@ */Cargo.toml @xMAC94x Cargo.toml @xMAC94x -rust-toolchain @xMAC94x \ No newline at end of file +rust-toolchain @xMAC94x +.gitlab/scripts/* @xMAC94x \ No newline at end of file diff --git a/.gitlab/scripts/linux.sh b/.gitlab/scripts/linux.sh index 9b6cf3be27..e0530fc623 100755 --- a/.gitlab/scripts/linux.sh +++ b/.gitlab/scripts/linux.sh @@ -1,5 +1,4 @@ #!/bin/bash export VELOREN_USERDATA_STRATEGY=executable time cargo build --release --no-default-features --features default-publish && -time cargo build --release -p veloren-server-cli # eveluate --bin instead, last time i checked (2021-07-14) it was 2 minutes slower on release (but faster on debug) \ No newline at end of file diff --git a/.gitlab/scripts/windows.sh b/.gitlab/scripts/windows.sh index a2f6964f36..bbbc630b36 100755 --- a/.gitlab/scripts/windows.sh +++ b/.gitlab/scripts/windows.sh @@ -2,5 +2,4 @@ update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix export VELOREN_USERDATA_STRATEGY=executable -time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish && -time cargo build --target=x86_64-pc-windows-gnu --release -p veloren-server-cli \ No newline at end of file +time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish && \ No newline at end of file diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index b1a0b0c490..bbe0bd15f4 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -16,6 +16,8 @@ This package includes the official server CLI. [features] worldgen = ["server/worldgen"] +# needed to stay compatible with voxygens format +default-publish = ["default"] default = ["worldgen"] tracy = ["common-frontend/tracy"] plugins = ["server/plugins"]