From 933063a8f445771699cbc3dcb6cf89ac41f3205e Mon Sep 17 00:00:00 2001
From: Forest Anderson <forestkzanderson@gmail.com>
Date: Sun, 7 Jul 2019 08:35:39 -0400
Subject: [PATCH] Stopped server from building

---
 .gitlab-ci.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b54f697b23..0df81c9e0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ build-voxygen:
   tags:
     - veloren-docker
   script:
-    - (cd voxygen && cargo rustc -v --features="discord" --manifest-path voxygen/Cargo.toml -- -D warnings)
+    - (cd voxygen && cargo rustc -v --features="discord" --manifest-path Cargo.toml -- -D warnings)
 
 build-server-cli:
   stage: build
@@ -56,7 +56,7 @@ build-server-cli:
   tags:
     - veloren-docker
   script:
-    - (cd server-cli && cargo rustc -v --features="discord" --manifest-path voxygen/Cargo.toml -- -D warnings)
+    - (cd server-cli && cargo rustc -v -- -D warnings)
 
 #############
 # TEST
@@ -131,7 +131,7 @@ clippy:
 commit:linux-debug:
   <<: *commit
   script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build)
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --features="discord" --manifest-path Cargo.toml)
     - (cd server-cli && VELOREN_ASSETS=assets cargo build)
     - rm -r -f commit-build
     - mkdir commit-build
@@ -149,7 +149,7 @@ commit:linux-debug:
 commit:windows-debug:
   <<: *commit
   script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --features="discord" --manifest-path Cargo.toml)
     - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
     - rm -r -f commit-build
     - mkdir commit-build
@@ -180,8 +180,8 @@ commit:windows-debug:
 optional:linux-debug:
   <<: *optional
   script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --features="discord" --manifest-path voxygen/Cargo.toml)
-    - (cd server-cli && VELOREN_ASSETS=assets cargo build --features="discord" --manifest-path voxygen/Cargo.toml)
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --features="discord" --manifest-path Cargo.toml)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build)
     - rm -r -f optional-build
     - mkdir optional-build
     - cp target/debug/veloren-server-cli optional-build
@@ -198,8 +198,8 @@ optional:linux-debug:
 optional:windows-debug:
   <<: *optional
   script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --features="discord" --manifest-path voxygen/Cargo.toml)
-    - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --features="discord" --manifest-path voxygen/Cargo.toml)
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --features="discord" --manifest-path Cargo.toml)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
     - rm -r -f optional-build
     - mkdir optional-build
     - cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe optional-build
@@ -228,8 +228,8 @@ optional:windows-debug:
 nightly:linux-optimized:
   <<: *nightly
   script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --features="discord" --manifest-path voxygen/Cargo.toml)
-    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --features="discord" --manifest-path voxygen/Cargo.toml)
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --features="discord" --manifest-path Cargo.toml)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release)
     - rm -r -f nightly-build
     - mkdir nightly-build
     - cp target/release/veloren-server-cli nightly-build
@@ -246,8 +246,8 @@ nightly:linux-optimized:
 nightly:windows-optimized:
   <<: *nightly
   script:
-    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu --features="discord" --manifest-path voxygen/Cargo.toml)
-    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu --features="discord" --manifest-path voxygen/Cargo.toml)
+    - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu --features="discord" --manifest-path Cargo.toml)
+    - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
     - rm -r -f nightly-build
     - mkdir nightly-build
     - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly-build