From f0a324e729f682e63518ce580ab48bfc134284c8 Mon Sep 17 00:00:00 2001 From: Imbris Date: Tue, 13 Jun 2023 01:01:26 -0400 Subject: [PATCH 1/2] Minor CI optimization (don't fetch git repo in docker publishing job where we don't use it) (and cargo decided to update cfg-if version in random dependency) --- .gitlab/CI/publish.gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml index c6ec4796ce..b95d5412f5 100644 --- a/.gitlab/CI/publish.gitlab-ci.yml +++ b/.gitlab/CI/publish.gitlab-ci.yml @@ -9,6 +9,8 @@ docker: extends: .publish + variables: + GIT_STRATEGY: none image: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] @@ -33,6 +35,7 @@ gittag: extends: .publish rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" + # TODO: could use lighter image, since we don't need the cache or rust toolchain here image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG} dependencies: [] tags: ["veloren/veloren", "publish", "trusted"] From fb99265d4a1fc496449110e25b719f6204e272d5 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sun, 16 Jul 2023 20:30:38 -0400 Subject: [PATCH 2/2] Use common base image for gittag job --- .gitlab/CI/publish.gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml index b95d5412f5..9840933022 100644 --- a/.gitlab/CI/publish.gitlab-ci.yml +++ b/.gitlab/CI/publish.gitlab-ci.yml @@ -35,8 +35,7 @@ gittag: extends: .publish rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" - # TODO: could use lighter image, since we don't need the cache or rust toolchain here - image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG} + image: registry.gitlab.com/veloren/veloren-docker-ci/base/common:${CACHE_IMAGE_TAG} dependencies: [] tags: ["veloren/veloren", "publish", "trusted"] script: