CI: Fix the publish rules

This commit is contained in:
Grégoire Henry 2018-01-29 22:11:18 +01:00
parent 6e7ca5ddaf
commit 260a717cc1
2 changed files with 4 additions and 3 deletions

View File

@ -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

View File

@ -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"