summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2021-08-29 15:45:19 (GMT)
committerElan Ruusamäe2021-08-29 15:45:19 (GMT)
commit90e76664424afc0d67aa0171a0179c5b0ebf4bb3 (patch)
treee951ce4e4a0fe2e0f14576a875304e97276e2b80
parente27f91d0d1cb05ab475a096f353116fea8e257b0 (diff)
downloadcleanbuild-90e76664424afc0d67aa0171a0179c5b0ebf4bb3.zip
cleanbuild-90e76664424afc0d67aa0171a0179c5b0ebf4bb3.tar.gz
Update CI to use extends rather YAML anchors
-rw-r--r--.gitlab-ci.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c944134..eef918f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
- test
- release
-.dind: &dind
+.dind:
image: docker:latest
variables:
DOCKER_BUILDKIT: "1"
@@ -17,14 +17,14 @@ stages:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
build:
- <<: *dind
+ extends: .dind
stage: build
script: |
docker build --pull -t $CONTAINER_TEST_IMAGE docker
docker push $CONTAINER_TEST_IMAGE
-.release: &release
- <<: *dind
+.release:
+ extends: .dind
stage: release
script: |
docker pull $CONTAINER_TEST_IMAGE
@@ -32,7 +32,7 @@ build:
docker push $CONTAINER_IMAGE
release branch:
- <<: *release
+ extends: .release
variables:
CONTAINER_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
except:
@@ -40,14 +40,14 @@ release branch:
- tags
release master:
- <<: *release
+ extends: .release
variables:
CONTAINER_IMAGE: $CI_REGISTRY_IMAGE:latest
only:
- master
release tag:
- <<: *release
+ extends: .release
variables:
CONTAINER_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
only: