Stopped server from building

This commit is contained in:
Forest Anderson 2019-07-07 08:35:39 -04:00 committed by Songtronix
parent 8786b7b4b7
commit 933063a8f4

View File

@ -48,7 +48,7 @@ build-voxygen:
tags: tags:
- veloren-docker - veloren-docker
script: 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: build-server-cli:
stage: build stage: build
@ -56,7 +56,7 @@ build-server-cli:
tags: tags:
- veloren-docker - veloren-docker
script: 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 # TEST
@ -131,7 +131,7 @@ clippy:
commit:linux-debug: commit:linux-debug:
<<: *commit <<: *commit
script: 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) - (cd server-cli && VELOREN_ASSETS=assets cargo build)
- rm -r -f commit-build - rm -r -f commit-build
- mkdir commit-build - mkdir commit-build
@ -149,7 +149,7 @@ commit:linux-debug:
commit:windows-debug: commit:windows-debug:
<<: *commit <<: *commit
script: 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) - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
- rm -r -f commit-build - rm -r -f commit-build
- mkdir commit-build - mkdir commit-build
@ -180,8 +180,8 @@ commit:windows-debug:
optional:linux-debug: optional:linux-debug:
<<: *optional <<: *optional
script: script:
- (cd voxygen && 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 --features="discord" --manifest-path voxygen/Cargo.toml) - (cd server-cli && VELOREN_ASSETS=assets cargo build)
- rm -r -f optional-build - rm -r -f optional-build
- mkdir optional-build - mkdir optional-build
- cp target/debug/veloren-server-cli optional-build - cp target/debug/veloren-server-cli optional-build
@ -198,8 +198,8 @@ optional:linux-debug:
optional:windows-debug: optional:windows-debug:
<<: *optional <<: *optional
script: script:
- (cd voxygen && 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 --features="discord" --manifest-path voxygen/Cargo.toml) - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
- rm -r -f optional-build - rm -r -f optional-build
- mkdir optional-build - mkdir optional-build
- cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe 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:linux-optimized:
<<: *nightly <<: *nightly
script: script:
- (cd voxygen && 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 --features="discord" --manifest-path voxygen/Cargo.toml) - (cd server-cli && VELOREN_ASSETS=assets cargo build --release)
- rm -r -f nightly-build - rm -r -f nightly-build
- mkdir nightly-build - mkdir nightly-build
- cp target/release/veloren-server-cli nightly-build - cp target/release/veloren-server-cli nightly-build
@ -246,8 +246,8 @@ nightly:linux-optimized:
nightly:windows-optimized: nightly:windows-optimized:
<<: *nightly <<: *nightly
script: script:
- (cd voxygen && 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 --features="discord" --manifest-path voxygen/Cargo.toml) - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
- rm -r -f nightly-build - rm -r -f nightly-build
- mkdir nightly-build - mkdir nightly-build
- cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly-build - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly-build