Unhack the wgpu branch CI

This commit is contained in:
Imbris 2021-06-03 14:24:31 -04:00
parent d6e5827b8b
commit f3cb08170c
3 changed files with 26 additions and 26 deletions

View File

@ -12,7 +12,7 @@ variables:
# Note: this is deprecated!
# ttps://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
GIT_DEPTH: 3
GIT_CLEAN_FLAGS: -n
GIT_CLEAN_FLAGS: -f
CACHE_IMAGE_TAG: 7ea40612
default:
@ -25,7 +25,7 @@ default:
- runner_system_failure
- stuck_or_timeout_failure
tags:
- veloren-wgpu-docker
- veloren-docker
# NOTE: overriden for the `.tmacos` template so relevant changes need to be mirrored there
before_script:
@ -36,9 +36,9 @@ before_script:
- export DISABLE_GIT_LFS_CHECK=true
- export VELOREN_ASSETS="$(pwd)/assets"
- echo "VELOREN_ASSETS=$VELOREN_ASSETS"
#- export RUSTFLAGS="-D warnings"
- export RUSTFLAGS="-D warnings"
- export SHADERC_LIB_DIR=/shaderc/combined/
#- rm -rf target || echo "it seems that sometimes OLD data is left over"
- rm -rf target || echo "it seems that sometimes OLD data is left over"
# 8866215 is the user that is used to sync data to the collaboration repos
workflow:

View File

@ -1,17 +1,17 @@
# unittests:
# extends: .recompile-branch
# stage: build
# image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
# variables:
# GIT_DEPTH: 9999999999999
# script:
# - ln -s /dockercache/target target
# - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
# - cargo test --package veloren-i18n --lib test_all_localizations -- --nocapture --ignored
# - rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
# - cargo test
# retry:
# max: 2
unittests:
extends: .recompile-branch
stage: build
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
variables:
GIT_DEPTH: 9999999999999
script:
- ln -s /dockercache/target target
- rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- cargo test --package veloren-i18n --lib test_all_localizations -- --nocapture --ignored
- rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- cargo test
retry:
max: 2
benchmarks:
extends: .post-merge

View File

@ -9,11 +9,11 @@ code-quality:
- cargo clippy --all-targets --locked -- -D warnings
- cargo fmt --all -- --check
# security:
# extends: .recompile-branch
# stage: check
# image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
# allow_failure: true
# script:
# - ln -s /dockercache/target target
# - cargo audit
security:
extends: .recompile-branch
stage: check
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
allow_failure: true
script:
- ln -s /dockercache/target target
- cargo audit