From e6cbf517456b4722bc7f57f8b37c7573c5cb511f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 29 Jan 2018 23:23:52 +0100 Subject: [PATCH] CI: less jobs on `master` --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2a22b916..79623e56f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,6 +46,8 @@ prepare:opam: build_deps: <<: *dind_definition stage: build_deps + except: + - master@tezos/tezos script: ## Building dependencies... - ./scripts/ci/create_docker_image.build_deps.sh @@ -67,6 +69,8 @@ build_deps: build: <<: *build_deps_definition stage: build + except: + - master@tezos/tezos script: - make all - make build-test @@ -359,10 +363,13 @@ publish:docker:minimal: - alphanet@tezos/tezos - zeronet@tezos/tezos script: - - docker pull "${build_deps_image}:${CI_COMMIT_SHA}" - 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}"