From 25d094225e53cc315f61c7d20821095be3ccea1b Mon Sep 17 00:00:00 2001 From: Imbris Date: Thu, 27 Oct 2022 17:49:46 -0400 Subject: [PATCH] debuginfobuild --- .gitlab-ci.yml | 2 +- .gitlab/CI/release.yml | 4 +--- Cargo.toml | 26 ++++---------------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f924603ea..c7b47bd6eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ workflow: rules: - if: $CI_MERGE_REQUEST_IID - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $GITLAB_USER_ID != "8866215" + - if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ && $GITLAB_USER_ID != "8866215" include: diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml index 680f6c2646..f172c2667f 100644 --- a/.gitlab/CI/release.yml +++ b/.gitlab/CI/release.yml @@ -2,8 +2,6 @@ .optional-release: stage: check rules: - - if: $CI_PIPELINE_SOURCE != "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule" || ( $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $TAG_REGEX ) - when: never - when: manual allow_failure: true @@ -15,4 +13,4 @@ when: on_success - when: never retry: - max: 1 \ No newline at end of file + max: 1 diff --git a/Cargo.toml b/Cargo.toml index 5b61b4528a..af4843cd34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,31 +72,13 @@ debug = 1 # 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` [profile.release] -opt-level = 3 +opt-level = 2 overflow-checks = false debug-assertions = false -lto = true -debug = false -panic = "abort" # don't need unwinding so we can skip including the landing pads for that +# lto = true +debug = true +#panic = "abort" # don't need unwinding so we can skip including the landing pads for that # line tables so we can have useful backtraces for in-house crates -[profile.release.package."veloren-network"] -debug = 1 -[profile.release.package."veloren-network-protocol"] -debug = 1 -[profile.release.package."veloren-common"] -debug = 1 -[profile.release.package."veloren-common-systems"] -debug = 1 -[profile.release.package."veloren-client"] -debug = 1 -[profile.release.package."veloren-server"] -debug = 1 -[profile.release.package."veloren-server-cli"] -debug = 1 -[profile.release.package."veloren-voxygen"] -debug = 1 -[profile.release.package."veloren-world"] -debug = 1 # used for cargo bench [profile.bench]