From f4cc7395ed95e433e836f6cfcf65d849e7629024 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel
Date: Fri, 22 Mar 2019 03:39:46 +0100
Subject: Print more debug information

---
 .gitlab-ci.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 880d22d..4ffc162 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,8 @@ stages:
     IMAGE: "mathcomp-dev:make_coq-${COQ_VERSION}"
     OPAM_SWITCH: "edge"
   before_script:
+    - echo "${OPAM_SWITCH}"
+    - echo "${COQ_VERSION}"
   script:
     - docker build -f Dockerfile.make --pull --build-arg=coq_image="coqorg/coq:${COQ_VERSION}" --build-arg=compiler="${OPAM_SWITCH}" -t "${IMAGE}" .
   except:
@@ -65,6 +67,7 @@ make-coq-latest:
     IMAGE: "${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}_${CI_COMMIT_REF_SLUG}_${CI_JOB_NAME}"
     OPAM_SWITCH: "edge"
   before_script:
+    - echo "${OPAM_SWITCH}"
     - echo "${CI_JOB_TOKEN}" | docker login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
   script:
     - docker build --pull --build-arg=coq_image="coqorg/${CI_JOB_NAME//-/:}" --build-arg=compiler="${OPAM_SWITCH}" -t "${IMAGE}" .
@@ -98,11 +101,14 @@ coq-dev:
     GIT_STRATEGY: none
   before_script:
     - cat /proc/{cpu,mem}info || true
-    # don't printenv if there are private tokens
+    # don't printenv to avoid cluttering the log
     - opam config list
     - opam repo list
     - opam list
     - coqc --version
+    - echo "${COQ_VERSION}"
+    - echo "${CONTRIB_URL}"
+    - echo "${CONTRIB_VERSION}"
     - git clone -b "${CONTRIB_VERSION}" --depth 1 "${CONTRIB_URL}" /home/coq/ci
     - cd /home/coq/ci
     - git rev-parse --verify HEAD
@@ -186,7 +192,7 @@ ci-lemma-overloading-dev:
 ################
 
 # Changes below (or jobs extending .docker-deploy) should be carefully
-# reviewed to avoid unwanted "token leaks"
+# reviewed to avoid leaks of HUB_TOKEN
 .docker-deploy:
   stage: deploy
   image: docker:latest
@@ -200,9 +206,13 @@ ci-lemma-overloading-dev:
     IMAGE_PREFIX: "${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}_${CI_COMMIT_REF_SLUG}"
   script:
     - export IMAGE="${IMAGE_PREFIX}_${CI_JOB_NAME##*:}"
+    - echo "${IMAGE}"
     - docker pull "${IMAGE}"
-    - echo "${HUB_TOKEN}" | docker login -u "${HUB_REGISTRY_USER}" --password-stdin "${HUB_REGISTRY}"
+    - echo "${HUB_IMAGE}"
     - docker tag "${IMAGE}" "${HUB_IMAGE}"
+    - test -n "${HUB_REGISTRY}"
+    - test -n "${HUB_REGISTRY_USER}"
+    - echo "${HUB_TOKEN}" | docker login -u "${HUB_REGISTRY_USER}" --password-stdin "${HUB_REGISTRY}"
     - docker push "${HUB_IMAGE}"
     - docker logout "${HUB_REGISTRY}"
   only:
-- 
cgit v1.2.3