From 559587987ad3aaf6445f9c38e8bf94812455eaea Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sat, 5 Sep 2020 03:18:12 -0400
Subject: [PATCH] Tweak to build debuginfo artifact

---
 .gitlab-ci.yml                 |  1 +
 .gitlab/CI/build.gitlab-ci.yml | 24 ++++++++++++------------
 .gitlab/CI/release.yml         |  4 +---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bde49cf4d1..7ecbafb3bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,7 @@ workflow:
     - if: $CI_MERGE_REQUEST_IID
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - when: always
 
 include:
   - local: .gitlab/CI/recompile.yml
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index 011dda3f81..7d5e44bba0 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -34,9 +34,9 @@ benchmarks:
 .tlinux:
   script:
     - ln -s /dockercache/cache-release-linux target
-    - cargo build --release
-    - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
-    - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
+    - cargo build -Zunstable-options --profile debuginfo
+    - cp -r target/debuginfo/veloren-server-cli $CI_PROJECT_DIR
+    - cp -r target/debuginfo/veloren-voxygen $CI_PROJECT_DIR
   artifacts:
     paths:
       - veloren-server-cli
@@ -48,9 +48,9 @@ benchmarks:
 .twindows:
   script:
     - ln -s /dockercache/cache-release-windows target
-    - cargo build --target=x86_64-pc-windows-gnu --release
-    - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
-    - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
+    - cargo build --target=x86_64-pc-windows-gnu -Zunstable-options --profile debuginfo
+    - cp -r target/x86_64-pc-windows-gnu/debuginfo/veloren-server-cli.exe $CI_PROJECT_DIR
+    - cp -r target/x86_64-pc-windows-gnu/debuginfo/veloren-voxygen.exe $CI_PROJECT_DIR
   artifacts:
     paths:
       - veloren-server-cli.exe
@@ -62,9 +62,9 @@ benchmarks:
 .tmacos:
   script:
     - ln -s /dockercache/cache-release-macos target
-    - PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
-    - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR
-    - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR
+    - PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin -Zuntable-options --profile debuginfo
+    - cp -r target/x86_64-apple-darwin/debuginfo/veloren-server-cli $CI_PROJECT_DIR
+    - cp -r target/x86_64-apple-darwin/debuginfo/veloren-voxygen $CI_PROJECT_DIR
   artifacts:
     paths:
       - veloren-server-cli
@@ -93,14 +93,14 @@ macos:
 opt-linux:
   extends:
     - .tlinux
-    - .optional-release
+    - .optional-debuginfo
 
 opt-windows:
   extends:
     - .twindows
-    - .optional-release
+    - .optional-debuginfo
 
 opt-macos:
   extends:
     - .tmacos
-    - .optional-release
+    - .optional-debuginfo
diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml
index 7a59bd5b60..6c33fa7b34 100644
--- a/.gitlab/CI/release.yml
+++ b/.gitlab/CI/release.yml
@@ -1,11 +1,9 @@
 # allow_failure: true makes these pipelines manual and "non-blocking" which changed with except -> rule syntax
-.optional-release:
+.optional-debuginfo:
   stage: check
   tags:
     - veloren-docker
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ || $CI_PIPELINE_SOURCE == "schedule"
-      when: never
     - when: manual
       allow_failure: true