From e97d57b1197fcc68694dee071f4964ecafe10836 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sat, 20 Mar 2021 04:06:32 -0400 Subject: [PATCH] Disable CI that does not need to run for builds --- .gitlab-ci.yml | 6 +++--- .gitlab/CI/build.gitlab-ci.yml | 28 ++++++++++++++-------------- .gitlab/CI/check.gitlab-ci.yml | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1da084a988..a0c0d66c82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ variables: # Note: this is deprecated! # ttps://docs.gitlab.com/ee/ci/yaml/#shallow-cloning GIT_DEPTH: 3 - GIT_CLEAN_FLAGS: -f + GIT_CLEAN_FLAGS: -n CACHE_IMAGE_TAG: 7ea40612 default: @@ -36,8 +36,8 @@ before_script: - export DISABLE_GIT_LFS_CHECK=true - export VELOREN_ASSETS="$(pwd)/assets" - echo "VELOREN_ASSETS=$VELOREN_ASSETS" - - export RUSTFLAGS="-D warnings" - - rm -rf target || echo "it seems that sometimes OLD data is left over" + #- export RUSTFLAGS="-D warnings" + #- 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: diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml index 3f43cafbaf..02d09124af 100644 --- a/.gitlab/CI/build.gitlab-ci.yml +++ b/.gitlab/CI/build.gitlab-ci.yml @@ -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 diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml index a26a4caf8e..51c8642b2a 100644 --- a/.gitlab/CI/check.gitlab-ci.yml +++ b/.gitlab/CI/check.gitlab-ci.yml @@ -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