From 96114e07ded523d61408d455ad588c164375a067 Mon Sep 17 00:00:00 2001
From: Forest Anderson <forestkzanderson@gmail.com>
Date: Thu, 25 Apr 2019 09:06:37 -0400
Subject: [PATCH] Added nightly stuff

Former-commit-id: aaadaf472219d061d9c43503bf8fea1a0a6207e9
---
 .gitlab-ci.yml | 161 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 106 insertions(+), 55 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b992ebcf08..cd4e130432 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 stages:
   - build
   - test
-  - executable
   - post-build
+  - executable
 
 # our own git fetch command like https://gitlab.com/gitlab-org/gitlab-runner/blob/master/shells/abstract.go
 # speeds up building because we skip the git clean and dont need any gitlab caches
@@ -78,60 +78,6 @@ benchmarktests:
     - cargo bench
   allow_failure: true
 
-#############
-# EXECUTABLE
-#############
-
-nightly-linux-optimized:
-  stage: executable
-  image: registry.gitlab.com/veloren/veloren-docker-ci
-  tags:
-    - docker
-  script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release)
-    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release)
-    - rm -r -f nightly
-    - mkdir nightly
-    - cp target/release/veloren-server-cli nightly
-    - cp target/release/veloren-voxygen nightly
-    - cp -r assets nightly/
-    - cp -r voxygen/shaders nightly/
-    - rm -f nightly-linux-optimized.tar.bz2
-    - tar -cvjSf nightly-linux-optimized.tar.bz2 nightly
-  when: on_success
-  artifacts:
-    paths:
-      - nightly-linux-optimized.tar.bz2
-    expire_in: 2 days
-  only:
-    refs:
-      - master
-
-nightly-windows-optimized:
-  stage: executable
-  image: registry.gitlab.com/veloren/veloren-docker-ci
-  tags:
-    - docker
-  script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
-    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
-    - rm -r -f nightly
-    - mkdir nightly
-    - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly
-    - cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe nightly
-    - cp -r assets nightly/
-    - cp -r voxygen/shaders nightly/
-    - rm -f nightly-windows-optimized.zip
-    - zip -r nightly-windows-optimized.zip nightly
-  when: on_success
-  artifacts:
-    paths:
-      - nightly-windows-optimized.zip
-    expire_in: 2 days
-  only:
-    refs:
-      - master
-
 #############
 # POST-BUILD
 #############
@@ -168,3 +114,108 @@ clippy:
     - rustup component add clippy-preview --toolchain=nightly
     - cargo clippy --all -- -D clippy || echo "This job is disabled, because we are not activly using it now, so we dont want to see yellow failed partly"
   allow_failure: true
+
+#############
+# Debug
+#############
+
+linux-debug:
+  stage: executable
+  only: schedules
+  script:
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build)
+    - rm -r -f nightly
+    - mkdir nightly
+    - cp target/debug/veloren-server-cli nightly
+    - cp target/debug/veloren-voxygen nightly
+    - cp -r assets nightly/
+    - cp -r voxygen/shaders nightly/
+    - rm -f nightly-linux-debug.tar.bz2
+    - tar -cvjSf nightly-linux-debug.tar.bz2 nightly
+  when: always
+  artifacts:
+    paths:
+      - nightly-linux-debug.tar.bz2
+    expire_in: 1 week
+  only:
+    refs:
+      - master
+
+windows-debug:
+  stage: executable
+  only: schedules
+  script:
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
+    - rm -r -f nightly
+    - mkdir nightly
+    - cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe nightly
+    - cp target/x86_64-pc-windows-gnu/debug/veloren-voxygen.exe nightly
+    - cp -r assets nightly/
+    - cp -r voxygen/shaders nightly/
+    - rm -f nightly-windows-debug.zip
+    - zip -r nightly-windows-debug.zip nightly
+  artifacts:
+    paths:
+      - nightly-windows-debug.zip
+    expire_in: 1 week
+  only:
+    refs:
+      - master
+
+#############
+# Nightly
+#############
+
+nightly-linux-optimized:
+  stage: executable
+  only: schedules
+  image: registry.gitlab.com/veloren/veloren-docker-ci
+  tags:
+    - docker
+  script:
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release)
+    - rm -r -f nightly
+    - mkdir nightly
+    - cp target/release/veloren-server-cli nightly
+    - cp target/release/veloren-voxygen nightly
+    - cp -r assets nightly/
+    - cp -r voxygen/shaders nightly/
+    - rm -f nightly-linux-optimized.tar.bz2
+    - tar -cvjSf nightly-linux-optimized.tar.bz2 nightly
+  when: on_success
+  artifacts:
+    paths:
+      - nightly-linux-optimized.tar.bz2
+    expire_in: 2 days
+  only:
+    refs:
+      - master
+
+nightly-windows-optimized:
+  stage: executable
+  only: schedules
+  image: registry.gitlab.com/veloren/veloren-docker-ci
+  tags:
+    - docker
+  script:
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
+    - rm -r -f nightly
+    - mkdir nightly
+    - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly
+    - cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe nightly
+    - cp -r assets nightly/
+    - cp -r voxygen/shaders nightly/
+    - rm -f nightly-windows-optimized.zip
+    - zip -r nightly-windows-optimized.zip nightly
+  when: on_success
+  artifacts:
+    paths:
+      - nightly-windows-optimized.zip
+    expire_in: 2 days
+  only:
+    refs:
+      - master
\ No newline at end of file