From 260a717cc19bfc6504d7897c158bfbbbd992d9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 29 Jan 2018 22:11:18 +0100 Subject: [PATCH] CI: Fix the `publish` rules --- .gitlab-ci.yml | 5 +++-- scripts/ci/create_opam_repository.tezos_deps.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7ccb660a..241c8bdb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -363,10 +363,10 @@ publish:docker:minimal: - if [ "${CI_PROJECT_PATH}" = "tezos/tezos" ] ; then ./scripts/apply_patch.sh "${CI_COMMIT_REF_NAME}" ; fi - - ./scripts/create_docker_image.build.sh + - ./scripts/ci/create_docker_image.build.sh "tezos_build" "${CI_COMMIT_REF_NAME}" "${build_deps_image}:${CI_COMMIT_SHA}" - - ./scripts/create_docker_image.minimal.sh + - ./scripts/ci/create_docker_image.minimal.sh "${public_docker_image}" "${CI_COMMIT_REF_NAME}" "tezos_build:${CI_COMMIT_REF_NAME}" - mkdir ~/.docker || true @@ -390,6 +390,7 @@ publish:github: - if [ "${CI_PROJECT_PATH}" = "tezos/tezos" ] ; then ./scripts/apply_patch.sh "${CI_COMMIT_REF_NAME}" ; fi + - sudo apk add --no-cache openssh - git push git@github.com:tezos/tezos.git -f HEAD:${CI_COMMIT_REF_NAME} tags: - gitlab-org diff --git a/scripts/ci/create_opam_repository.tezos_deps.sh b/scripts/ci/create_opam_repository.tezos_deps.sh index 2a21f5aa0..0c78d3d3b 100755 --- a/scripts/ci/create_opam_repository.tezos_deps.sh +++ b/scripts/ci/create_opam_repository.tezos_deps.sh @@ -80,7 +80,7 @@ RUN opam bundle --yes --output="tezos_bundle-$ocaml_version" \ --repository=opam-repository-tezos \ --repository=opam-repository-master \ --ocaml=$ocaml_version \ - $packages depext ocp-indent + $packages depext ocp-indent odoc EOF docker build --pull -t $tmp_image "$tmp_dir"