From 32150e79a5b8f04a3011dd9873dd5fe59dd2f16d Mon Sep 17 00:00:00 2001 From: Matej Sima Date: Mon, 27 May 2019 17:36:08 +0200 Subject: [PATCH] Bring back non-publishing docker build --- .gitlab-ci.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e482eaeb6..7a7e37249 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,23 +79,22 @@ remote-repo-job: #- opam install -y ocp-indent #- opam user-setup install -# Run a docker build on the ligo image, to see if the current -# commit does not break it -# build-current-docker-image: -# stage: build -# <<: *docker -# <<: *docker_build -# except: -# - master +# Run a docker build without publishing to the registry +build-current-docker-image: + stage: build + <<: *docker + <<: *docker_build + except: + - master # When a MR/PR is merged to master # take the previous build and publish it to Docker Hub build-and-publish-latest-docker-image: stage: deploy <<: *docker - <<: *docker_build + <<: *docker_build after_script: - docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD - docker push $LIGO_REGISTRY_IMAGE:latest - # only: - # - master + only: + - master