From 4327be57d05f3a8d84ec24e240daa56c0c667245 Mon Sep 17 00:00:00 2001 From: Moul <moul@moul.re> Date: Sun, 4 Apr 2021 17:59:35 +0200 Subject: [PATCH] #388: mv test stage after package, test build Disable manual trigger --- .gitlab-ci.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95d719a2..82776d33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - checks - - tests - package + - tests - coverage variables: @@ -81,22 +81,21 @@ tests-3.9: tags: [docker] image: docker:latest services: - - docker:dind + - docker:dind script: - - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . - - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY + - docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true + - docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . + - docker login -u "$CI_REGISTRY_USER" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG" - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest" - docker push "$CI_REGISTRY_IMAGE:latest" - container: extends: .container variables: IMAGE_TAG: "dev" - rules: - - when: manual +# rules: +# - when: manual pypi_test: stage: package -- GitLab