Changes to test CI time with different images

This commit is contained in:
Imbris 2021-12-01 22:15:55 -05:00
parent 5274bf9eb3
commit 45862d7cde
4 changed files with 7 additions and 13 deletions

View File

@ -13,7 +13,7 @@ variables:
# https://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
GIT_DEPTH: 3
GIT_CLEAN_FLAGS: -f
CACHE_IMAGE_TAG: c94d1580
CACHE_IMAGE_TAG: 2e969af5
default:
# https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-pending-pipelines
@ -41,7 +41,7 @@ workflow:
rules:
- if: $CI_MERGE_REQUEST_IID
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $GITLAB_USER_ID != "8866215"
- if: $CI_COMMIT_BRANCH && $GITLAB_USER_ID != "8866215"
- if: $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ && $GITLAB_USER_ID != "8866215"
include:

View File

@ -36,7 +36,7 @@ benchmarks:
extends: .release
stage: build
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/bench:${CACHE_IMAGE_TAG}
tags: ["veloren/veloren", "check", "benchmark"]
tags: ["time-test"]
script:
- unset DISABLE_GIT_LFS_CHECK
- ln -s /dockercache/target target

View File

@ -3,7 +3,7 @@ code-quality:
extends: .recompile-branch
stage: check
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
tags: ["veloren/veloren", "check"]
tags: ["time-test"]
script:
- ln -s /dockercache/target target
- cat ./.gitlab/scripts/code-quality.sh
@ -13,7 +13,7 @@ security:
extends: .recompile-branch
stage: check
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
tags: ["veloren/veloren", "check"]
tags: ["time-test"]
allow_failure: true
script:
- ln -s /dockercache/target target

View File

@ -1,13 +1,7 @@
# Template to only run if actual changes has been made to the code and not just documentation
.recompile-branch:
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
# No '-' here is *very* important: https://docs.gitlab.com/ee/ci/yaml/#complex-rule-clauses
changes:
- "**/*.{glsl,png,rs,ron,toml,vox,yml,wav,sh}"
- "rust-toolchain"
- "Cargo.lock"
- ".gitlab-ci.yml"
- when: manual
# TODO: appears unused
# like .recompile-branch but will run on master too
@ -17,4 +11,4 @@
- "**/*.{glsl,png,rs,ron,toml,vox,yml,wav,sh}"
- "rust-toolchain"
- "Cargo.lock"
- ".gitlab-ci.yml"
- ".gitlab-ci.yml"