From 1a092be2a1b0bbe090f1a74bec1a1d09f50eb919 Mon Sep 17 00:00:00 2001 From: Imbris Date: Wed, 26 May 2021 22:46:09 -0400 Subject: [PATCH] Re-disable incremental for veloren-network-protocol, switch back to `veloren-docker` tagged runners --- .gitlab-ci.yml | 2 +- Cargo.toml | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1a864a411..9ba8620931 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ default: - runner_system_failure - stuck_or_timeout_failure tags: - - veloren-wgpu-docker + - veloren-docker before_script: - source $HOME/.cargo/env diff --git a/Cargo.toml b/Cargo.toml index b5fcbfced9..dffbf6ba0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,13 @@ lto = false incremental = true # All dependencies (but not this crate itself) [profile.dev.package."*"] +# TODO: seems like opt-level=2 should be sufficient here.... opt-level = 3 [profile.dev.package."veloren-network"] opt-level = 2 [profile.dev.package."veloren-network-protocol"] opt-level = 3 +incremental = false [profile.dev.package."veloren-common"] opt-level = 2 [profile.dev.package."veloren-common-systems"] @@ -57,13 +59,9 @@ opt-level = 2 [profile.dev.package."veloren-world"] opt-level = 2 -[profile.no_overflow.package."veloren-world"] -opt-level = 3 -[profile.no_overflow.package."veloren-voxygen-anim"] -opt-level = 3 - -# this profile is used by developers if dev doesn't has enough debug information, the name must != debug, as debug is used by dev because.... +# this profile is used by developers if dev doesn't has enough debug information, +# the name must != debug, as debug is used by dev because.... [profile.debuginfo] inherits= 'dev' debug = true @@ -75,6 +73,11 @@ inherits= 'dev' overflow-checks = false debug-assertions = false +[profile.no_overflow.package."veloren-world"] +opt-level = 3 +[profile.no_overflow.package."veloren-voxygen-anim"] +opt-level = 3 + # this profile is used for veloren releases, compile time doesn't matter # we need stacktraces, light debug information, as much checks as possible # I would like to put it in a seperate `official_release` target, but that doesnt share caches with `cargo test` and `cargo bench`