From ac10410782ebe18f24d8839b0b6c696029202bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Thu, 15 Jul 2021 10:56:32 +0200 Subject: [PATCH] only build once, dont build multiple targets. save time Profiles: (all are build, all are release, all are --no-default-features --features="default-publish" ) A) -p veloren-voxygen AND -p veloren-server-cli B) NONE AND -p veloren-server-cli C) NONE D) NONE but server-cli/Cargo.toml has a default-publish feature Timings A) > time cargo build -p veloren-voxygen --release --no-default-features --features default-publish Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client) Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47) Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server) Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549) Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14) Finished release [optimized] target(s) in 16m 19s cargo build -p veloren-voxygen --release --no-default-features --features 3091.78s user 71.80s system 322% cpu 16:19.44 total > time cargo build --release -p veloren-server-cli Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world) Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47) Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server) Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli) Finished release [optimized] target(s) in 6m 06s cargo build --release -p veloren-server-cli 1024.29s user 18.42s system 284% cpu 6:06.62 total B) > time cargo build --release --no-default-features --features default-publish Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client) Compiling veloren-voxygen-egui v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui) Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47) Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server) Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549) Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14) Compiling veloren-voxygen-anim-dyn v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim/dyn) Compiling veloren-voxygen-egui-dyn v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui/dyn) Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli) Finished release [optimized] target(s) in 17m 10s cargo build --release --no-default-features --features default-publish 4415.58s user 91.10s system 437% cpu 17:10.66 total > time cargo build --release -p veloren-server-cli Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world) Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47) Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server) Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli) Finished release [optimized] target(s) in 6m 08s cargo build --release -p veloren-server-cli 1123.93s user 23.01s system 311% cpu 6:08.14 total C) > time cargo build --release --no-default-features --features default-publish Compiling prometheus-hyper v0.1.2 Compiling authc v1.0.0 (https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4) Compiling veloren-common-net v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/net) Compiling veloren-plugin-api v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/api) Compiling veloren-voxygen-anim v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim) Compiling veloren-plugin-rt v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/rt) Compiling veloren-common-systems v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/systems) Compiling veloren-common-state v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/state) Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world) Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world) Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client) Compiling veloren-voxygen-egui v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui) Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47) Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server) Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549) Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14) Compiling veloren-voxygen-anim-dyn v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim/dyn) Compiling veloren-voxygen-egui-dyn v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui/dyn) Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli) Finished release [optimized] target(s) in 16m 41s cargo build --release --no-default-features --features default-publish 4349.71s user 90.02s system 443% cpu 16:41.58 total D) > time cargo build --release --no-default-features --features default-publish Compiling prometheus-hyper v0.1.2 Compiling authc v1.0.0 (https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4) Compiling veloren-common-net v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/net) Compiling veloren-plugin-api v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/api) Compiling veloren-voxygen-anim v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim) Compiling veloren-plugin-rt v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/rt) Compiling veloren-common-state v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/state) Compiling veloren-common-systems v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/systems) Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world) Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client) Compiling veloren-voxygen-egui v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui) Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47) Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server) Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3) Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549) Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14) Compiling veloren-voxygen-egui-dyn v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui/dyn) Compiling veloren-voxygen-anim-dyn v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim/dyn) Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli) Finished release [optimized] target(s) in 17m 30s cargo build --release --no-default-features --features default-publish 4462.34s user 92.17s system 433% cpu 17:31.00 total Hashes A) veloren-voxygen: e9de69144b4d459dc0da2775b2b87ac9 veloren-server-cli: 8c131c1b1daaa6efd0f83d95d9b5dad9 B) veloren-voxygen: 415e14ec1c14a6a559d2908b843d88d5 veloren-server-cli: 8c131c1b1daaa6efd0f83d95d9b5dad9 C) veloren-voxygen: 415e14ec1c14a6a559d2908b843d88d5 veloren-server-cli: 3bf56d0d0a76191a578ed5e71389f512 D) veloren-voxygen: 415e14ec1c14a6a559d2908b843d88d5 veloren-server-cli: c9dc4fb0bfcbd831150eebac788e2f71 Binary Sizes: A) veloren-voxygen: 156667288 veloren-server-cli: 85136736 B) veloren-voxygen: 162860552 veloren-server-cli: 85136736 C) veloren-voxygen: 162860552 veloren-server-cli: 95597304 D) veloren-voxygen: 162860552 veloren-server-cli: 95586360 Total Cache Size: A) 4.1G B) 5G C) 4.1G D) 4.1G --- .gitlab/CI/build.gitlab-ci.yml | 3 +-- .gitlab/CODEOWNERS | 3 ++- .gitlab/scripts/linux.sh | 1 - .gitlab/scripts/windows.sh | 3 +-- server-cli/Cargo.toml | 2 ++ 5 files changed, 6 insertions(+), 6 deletions(-) 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"]