From 636a61bf2b80eb70372a074ec63520b6f2141fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Tue, 30 Jan 2018 10:12:21 +0100
Subject: [PATCH] TMP merge

---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79623e56f..ff039730c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,8 +46,6 @@ prepare:opam:
 build_deps:
   <<: *dind_definition
   stage: build_deps
-  except:
-    - master@tezos/tezos
   script:
     ## Building dependencies...
     - ./scripts/ci/create_docker_image.build_deps.sh
@@ -366,10 +364,6 @@ publish:docker:minimal:
     - if [ "${CI_PROJECT_PATH}" = "tezos/tezos" ] ; then
         ./scripts/apply_patch.sh "${CI_COMMIT_REF_NAME}" ;
       fi
-    - ./scripts/ci/create_docker_image.build_deps.sh
-        "${build_deps_image}" "${CI_COMMIT_SHA}"
-        "${opam_image}:alpine-${alpine_version}_ocaml-${ocaml_version}"
-        "yes"
     - ./scripts/ci/create_docker_image.build.sh
         "tezos_build" "${CI_COMMIT_REF_NAME}"
         "${build_deps_image}:${CI_COMMIT_SHA}"