Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unhack the wgpu branch CI

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

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

28
.gitlab/CI/build.gitlab-ci.yml
View File

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

16
.gitlab/CI/check.gitlab-ci.yml
View File

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